pradosoft / prado

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);

tests/test_tools/simpletest/frames.php

Doc Comments +1 added lines, -1 removed lines

@@ -554,7 +554,7 @@
          *    available.
          *    @param SimpleSelector $selector    Field finder.
          *    @param string $value               Value to set field to.
-         *    @return boolean                    True if value is valid.
+         *    @return boolean|null                    True if value is valid.
          *    @access public
          */
         function setField($selector, $value) {

Indentation +582 added lines, -582 removed lines

@@ -1,587 +1,587 @@
 <?php
-    /**
-     *	Base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	WebTester
-     *	@version	$Id: frames.php 1398 2006-09-08 19:31:03Z xue $
-     */
-
-    /**#@+
+	/**
+	 *	Base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	WebTester
+	 *	@version	$Id: frames.php 1398 2006-09-08 19:31:03Z xue $
+	 */
+
+	/**#@+
      *	include other SimpleTest class files
      */
-    require_once(dirname(__FILE__) . '/page.php');
-    require_once(dirname(__FILE__) . '/user_agent.php');
-    /**#@-*/
-
-    /**
-     *    A composite page. Wraps a frameset page and
-     *    adds subframes. The original page will be
-     *    mostly ignored. Implements the SimplePage
-     *    interface so as to be interchangeable.
+	require_once(dirname(__FILE__) . '/page.php');
+	require_once(dirname(__FILE__) . '/user_agent.php');
+	/**#@-*/
+
+	/**
+	 *    A composite page. Wraps a frameset page and
+	 *    adds subframes. The original page will be
+	 *    mostly ignored. Implements the SimplePage
+	 *    interface so as to be interchangeable.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleFrameset {
-        protected $_frameset;
-        protected $_frames;
-        protected $_focus;
-        protected $_names;
-
-        /**
-         *    Stashes the frameset page. Will make use of the
-         *    browser to fetch the sub frames recursively.
-         *    @param SimplePage $page        Frameset page.
-         */
-        function SimpleFrameset($page) {
-            $this->_frameset = $page;
-            $this->_frames = array();
-            $this->_focus = false;
-            $this->_names = array();
-        }
-
-        /**
-         *    Adds a parsed page to the frameset.
-         *    @param SimplePage $page    Frame page.
-         *    @param string $name        Name of frame in frameset.
-         *    @access public
-         */
-        function addFrame($page, $name = false) {
-            $this->_frames[] = $page;
-            if ($name) {
-                $this->_names[$name] = count($this->_frames) - 1;
-            }
-        }
-
-        /**
-         *    Replaces existing frame with another. If the
-         *    frame is nested, then the call is passed down
-         *    one level.
-         *    @param array $path        Path of frame in frameset.
-         *    @param SimplePage $page   Frame source.
-         *    @access public
-         */
-        function setFrame($path, $page) {
-            $name = array_shift($path);
-            if (isset($this->_names[$name])) {
-                $index = $this->_names[$name];
-            } else {
-                $index = $name - 1;
-            }
-            if (count($path) == 0) {
-                $this->_frames[$index] = $page;
-                return;
-            }
-            $this->_frames[$index]->setFrame($path, $page);
-        }
-
-        /**
-         *    Accessor for current frame focus. Will be
-         *    false if no frame has focus. Will have the nested
-         *    frame focus if any.
-         *    @return array     Labels or indexes of nested frames.
-         *    @access public
-         */
-        function getFrameFocus() {
-            if ($this->_focus === false) {
-                return array();
-            }
-            return array_merge(
-                    array($this->_getPublicNameFromIndex($this->_focus)),
-                    $this->_frames[$this->_focus]->getFrameFocus());
-        }
-
-        /**
-         *    Turns an internal array index into the frames list
-         *    into a public name, or if none, then a one offset
-         *    index.
-         *    @param integer $subject    Internal index.
-         *    @return integer/string     Public name.
-         *    @access private
-         */
-        function _getPublicNameFromIndex($subject) {
-            foreach ($this->_names as $name => $index) {
-                if ($subject == $index) {
-                    return $name;
-                }
-            }
-            return $subject + 1;
-        }
-
-        /**
-         *    Sets the focus by index. The integer index starts from 1.
-         *    If already focused and the target frame also has frames,
-         *    then the nested frame will be focused.
-         *    @param integer $choice    Chosen frame.
-         *    @return boolean           True if frame exists.
-         *    @access public
-         */
-        function setFrameFocusByIndex($choice) {
-            if (is_integer($this->_focus)) {
-                if ($this->_frames[$this->_focus]->hasFrames()) {
-                    return $this->_frames[$this->_focus]->setFrameFocusByIndex($choice);
-                }
-            }
-            if (($choice < 1) || ($choice > count($this->_frames))) {
-                return false;
-            }
-            $this->_focus = $choice - 1;
-            return true;
-        }
-
-        /**
-         *    Sets the focus by name. If already focused and the
-         *    target frame also has frames, then the nested frame
-         *    will be focused.
-         *    @param string $name    Chosen frame.
-         *    @return boolean        True if frame exists.
-         *    @access public
-         */
-        function setFrameFocus($name) {
-            if (is_integer($this->_focus)) {
-                if ($this->_frames[$this->_focus]->hasFrames()) {
-                    return $this->_frames[$this->_focus]->setFrameFocus($name);
-                }
-            }
-            if (in_array($name, array_keys($this->_names))) {
-                $this->_focus = $this->_names[$name];
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         *    Clears the frame focus.
-         *    @access public
-         */
-        function clearFrameFocus() {
-            $this->_focus = false;
-            $this->_clearNestedFramesFocus();
-        }
-
-        /**
-         *    Clears the frame focus for any nested frames.
-         *    @access private
-         */
-        function _clearNestedFramesFocus() {
-            for ($i = 0; $i < count($this->_frames); $i++) {
-                $this->_frames[$i]->clearFrameFocus();
-            }
-        }
-
-        /**
-         *    Test for the presence of a frameset.
-         *    @return boolean        Always true.
-         *    @access public
-         */
-        function hasFrames() {
-            return true;
-        }
-
-        /**
-         *    Accessor for frames information.
-         *    @return array/string      Recursive hash of frame URL strings.
-         *                              The key is either a numerical
-         *                              index or the name attribute.
-         *    @access public
-         */
-        function getFrames() {
-            $report = array();
-            for ($i = 0; $i < count($this->_frames); $i++) {
-                $report[$this->_getPublicNameFromIndex($i)] =
-                        $this->_frames[$i]->getFrames();
-            }
-            return $report;
-        }
-
-        /**
-         *    Accessor for raw text of either all the pages or
-         *    the frame in focus.
-         *    @return string        Raw unparsed content.
-         *    @access public
-         */
-        function getRaw() {
-            if (is_integer($this->_focus)) {
-                return $this->_frames[$this->_focus]->getRaw();
-            }
-            $raw = '';
-            for ($i = 0; $i < count($this->_frames); $i++) {
-                $raw .= $this->_frames[$i]->getRaw();
-            }
-            return $raw;
-        }
-
-        /**
-         *    Accessor for plain text of either all the pages or
-         *    the frame in focus.
-         *    @return string        Plain text content.
-         *    @access public
-         */
-        function getText() {
-            if (is_integer($this->_focus)) {
-                return $this->_frames[$this->_focus]->getText();
-            }
-            $raw = '';
-            for ($i = 0; $i < count($this->_frames); $i++) {
-                $raw .= ' ' . $this->_frames[$i]->getText();
-            }
-            return trim($raw);
-        }
-
-        /**
-         *    Accessor for last error.
-         *    @return string        Error from last response.
-         *    @access public
-         */
-        function getTransportError() {
-            if (is_integer($this->_focus)) {
-                return $this->_frames[$this->_focus]->getTransportError();
-            }
-            return $this->_frameset->getTransportError();
-        }
-
-        /**
-         *    Request method used to fetch this frame.
-         *    @return string      GET, POST or HEAD.
-         *    @access public
-         */
-        function getMethod() {
-            if (is_integer($this->_focus)) {
-                return $this->_frames[$this->_focus]->getMethod();
-            }
-            return $this->_frameset->getMethod();
-        }
-
-        /**
-         *    Original resource name.
-         *    @return SimpleUrl        Current url.
-         *    @access public
-         */
-        function getUrl() {
-            if (is_integer($this->_focus)) {
-                $url = $this->_frames[$this->_focus]->getUrl();
-                $url->setTarget($this->_getPublicNameFromIndex($this->_focus));
-            } else {
-                $url = $this->_frameset->getUrl();
-            }
-            return $url;
-        }
-
-        /**
-         *    Original request data.
-         *    @return mixed              Sent content.
-         *    @access public
-         */
-        function getRequestData() {
-            if (is_integer($this->_focus)) {
-                return $this->_frames[$this->_focus]->getRequestData();
-            }
-            return $this->_frameset->getRequestData();
-        }
-
-        /**
-         *    Accessor for current MIME type.
-         *    @return string    MIME type as string; e.g. 'text/html'
-         *    @access public
-         */
-        function getMimeType() {
-            if (is_integer($this->_focus)) {
-                return $this->_frames[$this->_focus]->getMimeType();
-            }
-            return $this->_frameset->getMimeType();
-        }
-
-        /**
-         *    Accessor for last response code.
-         *    @return integer    Last HTTP response code received.
-         *    @access public
-         */
-        function getResponseCode() {
-            if (is_integer($this->_focus)) {
-                return $this->_frames[$this->_focus]->getResponseCode();
-            }
-            return $this->_frameset->getResponseCode();
-        }
-
-        /**
-         *    Accessor for last Authentication type. Only valid
-         *    straight after a challenge (401).
-         *    @return string    Description of challenge type.
-         *    @access public
-         */
-        function getAuthentication() {
-            if (is_integer($this->_focus)) {
-                return $this->_frames[$this->_focus]->getAuthentication();
-            }
-            return $this->_frameset->getAuthentication();
-        }
-
-        /**
-         *    Accessor for last Authentication realm. Only valid
-         *    straight after a challenge (401).
-         *    @return string    Name of security realm.
-         *    @access public
-         */
-        function getRealm() {
-            if (is_integer($this->_focus)) {
-                return $this->_frames[$this->_focus]->getRealm();
-            }
-            return $this->_frameset->getRealm();
-        }
-
-        /**
-         *    Accessor for outgoing header information.
-         *    @return string      Header block.
-         *    @access public
-         */
-        function getRequest() {
-            if (is_integer($this->_focus)) {
-                return $this->_frames[$this->_focus]->getRequest();
-            }
-            return $this->_frameset->getRequest();
-        }
-
-        /**
-         *    Accessor for raw header information.
-         *    @return string      Header block.
-         *    @access public
-         */
-        function getHeaders() {
-            if (is_integer($this->_focus)) {
-                return $this->_frames[$this->_focus]->getHeaders();
-            }
-            return $this->_frameset->getHeaders();
-        }
-
-        /**
-         *    Accessor for parsed title.
-         *    @return string     Title or false if no title is present.
-         *    @access public
-         */
-        function getTitle() {
-            return $this->_frameset->getTitle();
-        }
-
-        /**
-         *    Accessor for a list of all fixed links.
-         *    @return array   List of urls with scheme of
-         *                    http or https and hostname.
-         *    @access public
-         */
-        function getAbsoluteUrls() {
-            if (is_integer($this->_focus)) {
-                return $this->_frames[$this->_focus]->getAbsoluteUrls();
-            }
-            $urls = array();
-            foreach ($this->_frames as $frame) {
-                $urls = array_merge($urls, $frame->getAbsoluteUrls());
-            }
-            return array_values(array_unique($urls));
-        }
-
-        /**
-         *    Accessor for a list of all relative links.
-         *    @return array      List of urls without hostname.
-         *    @access public
-         */
-        function getRelativeUrls() {
-            if (is_integer($this->_focus)) {
-                return $this->_frames[$this->_focus]->getRelativeUrls();
-            }
-            $urls = array();
-            foreach ($this->_frames as $frame) {
-                $urls = array_merge($urls, $frame->getRelativeUrls());
-            }
-            return array_values(array_unique($urls));
-        }
-
-        /**
-         *    Accessor for URLs by the link label. Label will match
-         *    regardess of whitespace issues and case.
-         *    @param string $label    Text of link.
-         *    @return array           List of links with that label.
-         *    @access public
-         */
-        function getUrlsByLabel($label) {
-            if (is_integer($this->_focus)) {
-                return $this->_tagUrlsWithFrame(
-                        $this->_frames[$this->_focus]->getUrlsByLabel($label),
-                        $this->_focus);
-            }
-            $urls = array();
-            foreach ($this->_frames as $index => $frame) {
-                $urls = array_merge(
-                        $urls,
-                        $this->_tagUrlsWithFrame(
-                                    $frame->getUrlsByLabel($label),
-                                    $index));
-            }
-            return $urls;
-        }
-
-        /**
-         *    Accessor for a URL by the id attribute. If in a frameset
-         *    then the first link found with that ID attribute is
-         *    returned only. Focus on a frame if you want one from
-         *    a specific part of the frameset.
-         *    @param string $id       Id attribute of link.
-         *    @return string          URL with that id.
-         *    @access public
-         */
-        function getUrlById($id) {
-            foreach ($this->_frames as $index => $frame) {
-                if ($url = $frame->getUrlById($id)) {
-                    if (! $url->gettarget()) {
-                        $url->setTarget($this->_getPublicNameFromIndex($index));
-                    }
-                    return $url;
-                }
-            }
-            return false;
-        }
-
-        /**
-         *    Attaches the intended frame index to a list of URLs.
-         *    @param array $urls        List of SimpleUrls.
-         *    @param string $frame      Name of frame or index.
-         *    @return array             List of tagged URLs.
-         *    @access private
-         */
-        function _tagUrlsWithFrame($urls, $frame) {
-            $tagged = array();
-            foreach ($urls as $url) {
-                if (! $url->getTarget()) {
-                    $url->setTarget($this->_getPublicNameFromIndex($frame));
-                }
-                $tagged[] = $url;
-            }
-            return $tagged;
-        }
-
-        /**
-         *    Finds a held form by button label. Will only
-         *    search correctly built forms.
-         *    @param SimpleSelector $selector       Button finder.
-         *    @return SimpleForm                    Form object containing
-         *                                          the button.
-         *    @access public
-         */
-        function &getFormBySubmit($selector) {
-            $form = $this->_findForm('getFormBySubmit', $selector);
-            return $form;
-        }
-
-        /**
-         *    Finds a held form by image using a selector.
-         *    Will only search correctly built forms. The first
-         *    form found either within the focused frame, or
-         *    across frames, will be the one returned.
-         *    @param SimpleSelector $selector  Image finder.
-         *    @return SimpleForm               Form object containing
-         *                                     the image.
-         *    @access public
-         */
-        function &getFormByImage($selector) {
-            $form = $this->_findForm('getFormByImage', $selector);
-            return $form;
-        }
-
-        /**
-         *    Finds a held form by the form ID. A way of
-         *    identifying a specific form when we have control
-         *    of the HTML code. The first form found
-         *    either within the focused frame, or across frames,
-         *    will be the one returned.
-         *    @param string $id     Form label.
-         *    @return SimpleForm    Form object containing the matching ID.
-         *    @access public
-         */
-        function &getFormById($id) {
-            $form = $this->_findForm('getFormById', $id);
-            return $form;
-        }
-
-        /**
-         *    General form finder. Will search all the frames or
-         *    just the one in focus.
-         *    @param string $method    Method to use to find in a page.
-         *    @param string $attribute Label, name or ID.
-         *    @return SimpleForm    Form object containing the matching ID.
-         *    @access private
-         */
-        function &_findForm($method, $attribute) {
-            if (is_integer($this->_focus)) {
-                $form = $this->_findFormInFrame(
-                        $this->_frames[$this->_focus],
-                        $this->_focus,
-                        $method,
-                        $attribute);
-                return $form;
-            }
-            for ($i = 0; $i < count($this->_frames); $i++) {
-                $form = $this->_findFormInFrame(
-                        $this->_frames[$i],
-                        $i,
-                        $method,
-                        $attribute);
-                if ($form) {
-                    return $form;
-                }
-            }
-            $null = null;
-            return $null;
-        }
-
-        /**
-         *    Finds a form in a page using a form finding method. Will
-         *    also tag the form with the frame name it belongs in.
-         *    @param SimplePage $page  Page content of frame.
-         *    @param integer $index    Internal frame representation.
-         *    @param string $method    Method to use to find in a page.
-         *    @param string $attribute Label, name or ID.
-         *    @return SimpleForm       Form object containing the matching ID.
-         *    @access private
-         */
-        function &_findFormInFrame($page, $index, $method, $attribute) {
-            $form = $this->_frames[$index]->$method($attribute);
-            if (isset($form)) {
-                $form->setDefaultTarget($this->_getPublicNameFromIndex($index));
-            }
-            return $form;
-        }
-
-        /**
-         *    Sets a field on each form in which the field is
-         *    available.
-         *    @param SimpleSelector $selector    Field finder.
-         *    @param string $value               Value to set field to.
-         *    @return boolean                    True if value is valid.
-         *    @access public
-         */
-        function setField($selector, $value) {
-            if (is_integer($this->_focus)) {
-                $this->_frames[$this->_focus]->setField($selector, $value);
-            } else {
-                for ($i = 0; $i < count($this->_frames); $i++) {
-                    $this->_frames[$i]->setField($selector, $value);
-                }
-            }
-        }
-
-        /**
-         *    Accessor for a form element value within a page.
-         *    @param SimpleSelector $selector    Field finder.
-         *    @return string/boolean             A string if the field is
-         *                                       present, false if unchecked
-         *                                       and null if missing.
-         *    @access public
-         */
-        function getField($selector) {
-            for ($i = 0; $i < count($this->_frames); $i++) {
-                $value = $this->_frames[$i]->getField($selector);
-                if (isset($value)) {
-                    return $value;
-                }
-            }
-            return null;
-        }
-    }
\ No newline at end of file
+	 */
+	class SimpleFrameset {
+		protected $_frameset;
+		protected $_frames;
+		protected $_focus;
+		protected $_names;
+
+		/**
+		 *    Stashes the frameset page. Will make use of the
+		 *    browser to fetch the sub frames recursively.
+		 *    @param SimplePage $page        Frameset page.
+		 */
+		function SimpleFrameset($page) {
+			$this->_frameset = $page;
+			$this->_frames = array();
+			$this->_focus = false;
+			$this->_names = array();
+		}
+
+		/**
+		 *    Adds a parsed page to the frameset.
+		 *    @param SimplePage $page    Frame page.
+		 *    @param string $name        Name of frame in frameset.
+		 *    @access public
+		 */
+		function addFrame($page, $name = false) {
+			$this->_frames[] = $page;
+			if ($name) {
+				$this->_names[$name] = count($this->_frames) - 1;
+			}
+		}
+
+		/**
+		 *    Replaces existing frame with another. If the
+		 *    frame is nested, then the call is passed down
+		 *    one level.
+		 *    @param array $path        Path of frame in frameset.
+		 *    @param SimplePage $page   Frame source.
+		 *    @access public
+		 */
+		function setFrame($path, $page) {
+			$name = array_shift($path);
+			if (isset($this->_names[$name])) {
+				$index = $this->_names[$name];
+			} else {
+				$index = $name - 1;
+			}
+			if (count($path) == 0) {
+				$this->_frames[$index] = $page;
+				return;
+			}
+			$this->_frames[$index]->setFrame($path, $page);
+		}
+
+		/**
+		 *    Accessor for current frame focus. Will be
+		 *    false if no frame has focus. Will have the nested
+		 *    frame focus if any.
+		 *    @return array     Labels or indexes of nested frames.
+		 *    @access public
+		 */
+		function getFrameFocus() {
+			if ($this->_focus === false) {
+				return array();
+			}
+			return array_merge(
+					array($this->_getPublicNameFromIndex($this->_focus)),
+					$this->_frames[$this->_focus]->getFrameFocus());
+		}
+
+		/**
+		 *    Turns an internal array index into the frames list
+		 *    into a public name, or if none, then a one offset
+		 *    index.
+		 *    @param integer $subject    Internal index.
+		 *    @return integer/string     Public name.
+		 *    @access private
+		 */
+		function _getPublicNameFromIndex($subject) {
+			foreach ($this->_names as $name => $index) {
+				if ($subject == $index) {
+					return $name;
+				}
+			}
+			return $subject + 1;
+		}
+
+		/**
+		 *    Sets the focus by index. The integer index starts from 1.
+		 *    If already focused and the target frame also has frames,
+		 *    then the nested frame will be focused.
+		 *    @param integer $choice    Chosen frame.
+		 *    @return boolean           True if frame exists.
+		 *    @access public
+		 */
+		function setFrameFocusByIndex($choice) {
+			if (is_integer($this->_focus)) {
+				if ($this->_frames[$this->_focus]->hasFrames()) {
+					return $this->_frames[$this->_focus]->setFrameFocusByIndex($choice);
+				}
+			}
+			if (($choice < 1) || ($choice > count($this->_frames))) {
+				return false;
+			}
+			$this->_focus = $choice - 1;
+			return true;
+		}
+
+		/**
+		 *    Sets the focus by name. If already focused and the
+		 *    target frame also has frames, then the nested frame
+		 *    will be focused.
+		 *    @param string $name    Chosen frame.
+		 *    @return boolean        True if frame exists.
+		 *    @access public
+		 */
+		function setFrameFocus($name) {
+			if (is_integer($this->_focus)) {
+				if ($this->_frames[$this->_focus]->hasFrames()) {
+					return $this->_frames[$this->_focus]->setFrameFocus($name);
+				}
+			}
+			if (in_array($name, array_keys($this->_names))) {
+				$this->_focus = $this->_names[$name];
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 *    Clears the frame focus.
+		 *    @access public
+		 */
+		function clearFrameFocus() {
+			$this->_focus = false;
+			$this->_clearNestedFramesFocus();
+		}
+
+		/**
+		 *    Clears the frame focus for any nested frames.
+		 *    @access private
+		 */
+		function _clearNestedFramesFocus() {
+			for ($i = 0; $i < count($this->_frames); $i++) {
+				$this->_frames[$i]->clearFrameFocus();
+			}
+		}
+
+		/**
+		 *    Test for the presence of a frameset.
+		 *    @return boolean        Always true.
+		 *    @access public
+		 */
+		function hasFrames() {
+			return true;
+		}
+
+		/**
+		 *    Accessor for frames information.
+		 *    @return array/string      Recursive hash of frame URL strings.
+		 *                              The key is either a numerical
+		 *                              index or the name attribute.
+		 *    @access public
+		 */
+		function getFrames() {
+			$report = array();
+			for ($i = 0; $i < count($this->_frames); $i++) {
+				$report[$this->_getPublicNameFromIndex($i)] =
+						$this->_frames[$i]->getFrames();
+			}
+			return $report;
+		}
+
+		/**
+		 *    Accessor for raw text of either all the pages or
+		 *    the frame in focus.
+		 *    @return string        Raw unparsed content.
+		 *    @access public
+		 */
+		function getRaw() {
+			if (is_integer($this->_focus)) {
+				return $this->_frames[$this->_focus]->getRaw();
+			}
+			$raw = '';
+			for ($i = 0; $i < count($this->_frames); $i++) {
+				$raw .= $this->_frames[$i]->getRaw();
+			}
+			return $raw;
+		}
+
+		/**
+		 *    Accessor for plain text of either all the pages or
+		 *    the frame in focus.
+		 *    @return string        Plain text content.
+		 *    @access public
+		 */
+		function getText() {
+			if (is_integer($this->_focus)) {
+				return $this->_frames[$this->_focus]->getText();
+			}
+			$raw = '';
+			for ($i = 0; $i < count($this->_frames); $i++) {
+				$raw .= ' ' . $this->_frames[$i]->getText();
+			}
+			return trim($raw);
+		}
+
+		/**
+		 *    Accessor for last error.
+		 *    @return string        Error from last response.
+		 *    @access public
+		 */
+		function getTransportError() {
+			if (is_integer($this->_focus)) {
+				return $this->_frames[$this->_focus]->getTransportError();
+			}
+			return $this->_frameset->getTransportError();
+		}
+
+		/**
+		 *    Request method used to fetch this frame.
+		 *    @return string      GET, POST or HEAD.
+		 *    @access public
+		 */
+		function getMethod() {
+			if (is_integer($this->_focus)) {
+				return $this->_frames[$this->_focus]->getMethod();
+			}
+			return $this->_frameset->getMethod();
+		}
+
+		/**
+		 *    Original resource name.
+		 *    @return SimpleUrl        Current url.
+		 *    @access public
+		 */
+		function getUrl() {
+			if (is_integer($this->_focus)) {
+				$url = $this->_frames[$this->_focus]->getUrl();
+				$url->setTarget($this->_getPublicNameFromIndex($this->_focus));
+			} else {
+				$url = $this->_frameset->getUrl();
+			}
+			return $url;
+		}
+
+		/**
+		 *    Original request data.
+		 *    @return mixed              Sent content.
+		 *    @access public
+		 */
+		function getRequestData() {
+			if (is_integer($this->_focus)) {
+				return $this->_frames[$this->_focus]->getRequestData();
+			}
+			return $this->_frameset->getRequestData();
+		}
+
+		/**
+		 *    Accessor for current MIME type.
+		 *    @return string    MIME type as string; e.g. 'text/html'
+		 *    @access public
+		 */
+		function getMimeType() {
+			if (is_integer($this->_focus)) {
+				return $this->_frames[$this->_focus]->getMimeType();
+			}
+			return $this->_frameset->getMimeType();
+		}
+
+		/**
+		 *    Accessor for last response code.
+		 *    @return integer    Last HTTP response code received.
+		 *    @access public
+		 */
+		function getResponseCode() {
+			if (is_integer($this->_focus)) {
+				return $this->_frames[$this->_focus]->getResponseCode();
+			}
+			return $this->_frameset->getResponseCode();
+		}
+
+		/**
+		 *    Accessor for last Authentication type. Only valid
+		 *    straight after a challenge (401).
+		 *    @return string    Description of challenge type.
+		 *    @access public
+		 */
+		function getAuthentication() {
+			if (is_integer($this->_focus)) {
+				return $this->_frames[$this->_focus]->getAuthentication();
+			}
+			return $this->_frameset->getAuthentication();
+		}
+
+		/**
+		 *    Accessor for last Authentication realm. Only valid
+		 *    straight after a challenge (401).
+		 *    @return string    Name of security realm.
+		 *    @access public
+		 */
+		function getRealm() {
+			if (is_integer($this->_focus)) {
+				return $this->_frames[$this->_focus]->getRealm();
+			}
+			return $this->_frameset->getRealm();
+		}
+
+		/**
+		 *    Accessor for outgoing header information.
+		 *    @return string      Header block.
+		 *    @access public
+		 */
+		function getRequest() {
+			if (is_integer($this->_focus)) {
+				return $this->_frames[$this->_focus]->getRequest();
+			}
+			return $this->_frameset->getRequest();
+		}
+
+		/**
+		 *    Accessor for raw header information.
+		 *    @return string      Header block.
+		 *    @access public
+		 */
+		function getHeaders() {
+			if (is_integer($this->_focus)) {
+				return $this->_frames[$this->_focus]->getHeaders();
+			}
+			return $this->_frameset->getHeaders();
+		}
+
+		/**
+		 *    Accessor for parsed title.
+		 *    @return string     Title or false if no title is present.
+		 *    @access public
+		 */
+		function getTitle() {
+			return $this->_frameset->getTitle();
+		}
+
+		/**
+		 *    Accessor for a list of all fixed links.
+		 *    @return array   List of urls with scheme of
+		 *                    http or https and hostname.
+		 *    @access public
+		 */
+		function getAbsoluteUrls() {
+			if (is_integer($this->_focus)) {
+				return $this->_frames[$this->_focus]->getAbsoluteUrls();
+			}
+			$urls = array();
+			foreach ($this->_frames as $frame) {
+				$urls = array_merge($urls, $frame->getAbsoluteUrls());
+			}
+			return array_values(array_unique($urls));
+		}
+
+		/**
+		 *    Accessor for a list of all relative links.
+		 *    @return array      List of urls without hostname.
+		 *    @access public
+		 */
+		function getRelativeUrls() {
+			if (is_integer($this->_focus)) {
+				return $this->_frames[$this->_focus]->getRelativeUrls();
+			}
+			$urls = array();
+			foreach ($this->_frames as $frame) {
+				$urls = array_merge($urls, $frame->getRelativeUrls());
+			}
+			return array_values(array_unique($urls));
+		}
+
+		/**
+		 *    Accessor for URLs by the link label. Label will match
+		 *    regardess of whitespace issues and case.
+		 *    @param string $label    Text of link.
+		 *    @return array           List of links with that label.
+		 *    @access public
+		 */
+		function getUrlsByLabel($label) {
+			if (is_integer($this->_focus)) {
+				return $this->_tagUrlsWithFrame(
+						$this->_frames[$this->_focus]->getUrlsByLabel($label),
+						$this->_focus);
+			}
+			$urls = array();
+			foreach ($this->_frames as $index => $frame) {
+				$urls = array_merge(
+						$urls,
+						$this->_tagUrlsWithFrame(
+									$frame->getUrlsByLabel($label),
+									$index));
+			}
+			return $urls;
+		}
+
+		/**
+		 *    Accessor for a URL by the id attribute. If in a frameset
+		 *    then the first link found with that ID attribute is
+		 *    returned only. Focus on a frame if you want one from
+		 *    a specific part of the frameset.
+		 *    @param string $id       Id attribute of link.
+		 *    @return string          URL with that id.
+		 *    @access public
+		 */
+		function getUrlById($id) {
+			foreach ($this->_frames as $index => $frame) {
+				if ($url = $frame->getUrlById($id)) {
+					if (! $url->gettarget()) {
+						$url->setTarget($this->_getPublicNameFromIndex($index));
+					}
+					return $url;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 *    Attaches the intended frame index to a list of URLs.
+		 *    @param array $urls        List of SimpleUrls.
+		 *    @param string $frame      Name of frame or index.
+		 *    @return array             List of tagged URLs.
+		 *    @access private
+		 */
+		function _tagUrlsWithFrame($urls, $frame) {
+			$tagged = array();
+			foreach ($urls as $url) {
+				if (! $url->getTarget()) {
+					$url->setTarget($this->_getPublicNameFromIndex($frame));
+				}
+				$tagged[] = $url;
+			}
+			return $tagged;
+		}
+
+		/**
+		 *    Finds a held form by button label. Will only
+		 *    search correctly built forms.
+		 *    @param SimpleSelector $selector       Button finder.
+		 *    @return SimpleForm                    Form object containing
+		 *                                          the button.
+		 *    @access public
+		 */
+		function &getFormBySubmit($selector) {
+			$form = $this->_findForm('getFormBySubmit', $selector);
+			return $form;
+		}
+
+		/**
+		 *    Finds a held form by image using a selector.
+		 *    Will only search correctly built forms. The first
+		 *    form found either within the focused frame, or
+		 *    across frames, will be the one returned.
+		 *    @param SimpleSelector $selector  Image finder.
+		 *    @return SimpleForm               Form object containing
+		 *                                     the image.
+		 *    @access public
+		 */
+		function &getFormByImage($selector) {
+			$form = $this->_findForm('getFormByImage', $selector);
+			return $form;
+		}
+
+		/**
+		 *    Finds a held form by the form ID. A way of
+		 *    identifying a specific form when we have control
+		 *    of the HTML code. The first form found
+		 *    either within the focused frame, or across frames,
+		 *    will be the one returned.
+		 *    @param string $id     Form label.
+		 *    @return SimpleForm    Form object containing the matching ID.
+		 *    @access public
+		 */
+		function &getFormById($id) {
+			$form = $this->_findForm('getFormById', $id);
+			return $form;
+		}
+
+		/**
+		 *    General form finder. Will search all the frames or
+		 *    just the one in focus.
+		 *    @param string $method    Method to use to find in a page.
+		 *    @param string $attribute Label, name or ID.
+		 *    @return SimpleForm    Form object containing the matching ID.
+		 *    @access private
+		 */
+		function &_findForm($method, $attribute) {
+			if (is_integer($this->_focus)) {
+				$form = $this->_findFormInFrame(
+						$this->_frames[$this->_focus],
+						$this->_focus,
+						$method,
+						$attribute);
+				return $form;
+			}
+			for ($i = 0; $i < count($this->_frames); $i++) {
+				$form = $this->_findFormInFrame(
+						$this->_frames[$i],
+						$i,
+						$method,
+						$attribute);
+				if ($form) {
+					return $form;
+				}
+			}
+			$null = null;
+			return $null;
+		}
+
+		/**
+		 *    Finds a form in a page using a form finding method. Will
+		 *    also tag the form with the frame name it belongs in.
+		 *    @param SimplePage $page  Page content of frame.
+		 *    @param integer $index    Internal frame representation.
+		 *    @param string $method    Method to use to find in a page.
+		 *    @param string $attribute Label, name or ID.
+		 *    @return SimpleForm       Form object containing the matching ID.
+		 *    @access private
+		 */
+		function &_findFormInFrame($page, $index, $method, $attribute) {
+			$form = $this->_frames[$index]->$method($attribute);
+			if (isset($form)) {
+				$form->setDefaultTarget($this->_getPublicNameFromIndex($index));
+			}
+			return $form;
+		}
+
+		/**
+		 *    Sets a field on each form in which the field is
+		 *    available.
+		 *    @param SimpleSelector $selector    Field finder.
+		 *    @param string $value               Value to set field to.
+		 *    @return boolean                    True if value is valid.
+		 *    @access public
+		 */
+		function setField($selector, $value) {
+			if (is_integer($this->_focus)) {
+				$this->_frames[$this->_focus]->setField($selector, $value);
+			} else {
+				for ($i = 0; $i < count($this->_frames); $i++) {
+					$this->_frames[$i]->setField($selector, $value);
+				}
+			}
+		}
+
+		/**
+		 *    Accessor for a form element value within a page.
+		 *    @param SimpleSelector $selector    Field finder.
+		 *    @return string/boolean             A string if the field is
+		 *                                       present, false if unchecked
+		 *                                       and null if missing.
+		 *    @access public
+		 */
+		function getField($selector) {
+			for ($i = 0; $i < count($this->_frames); $i++) {
+				$value = $this->_frames[$i]->getField($selector);
+				if (isset($value)) {
+					return $value;
+				}
+			}
+			return null;
+		}
+	}
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -430,7 +430,7 @@ 
         function getUrlById($id) {
             foreach ($this->_frames as $index => $frame) {
                 if ($url = $frame->getUrlById($id)) {
-                    if (! $url->gettarget()) {
+                    if (!$url->gettarget()) {
                         $url->setTarget($this->_getPublicNameFromIndex($index));
                     }
                     return $url;
@@ -449,7 +449,7 @@ 
         function _tagUrlsWithFrame($urls, $frame) {
             $tagged = array();
             foreach ($urls as $url) {
-                if (! $url->getTarget()) {
+                if (!$url->getTarget()) {
                     $url->setTarget($this->_getPublicNameFromIndex($frame));
                 }
                 $tagged[] = $url;

tests/test_tools/simpletest/HtmlReporterWithCoverage.php

Doc Comments +3 added lines

@@ -141,6 +141,9 @@
 		}
 	}
 
+	/**
+	 * @param string $file
+	 */
 	function constructURL($file, $coverage)
 	{
 		$file = rawurlencode($file);

Spacing +25 added lines, -25 removed lines

@@ -19,10 +19,10 @@ 
 		$this->base_dir = $base_dir;
 	}
 
-	function paintHeader($test_name, $charset="UTF-8")
+	function paintHeader($test_name, $charset = "UTF-8")
 	{
 		$this->sendNoCacheHeaders();
-		header('Content-Type: text/html; Charset='.$charset);
+		header('Content-Type: text/html; Charset=' . $charset);
 		print "<html>\n<head>\n<title>$test_name</title>\n";
 		print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset={$charset}\"/>";
 		print "<style type=\"text/css\">\n";
@@ -42,7 +42,7 @@ 
 	 */
 	function _getCss()
 	{
-		$contents = parent::_getCss()."\n ";
+		$contents = parent::_getCss() . "\n ";
 		$contents .= '
 	 .bar { float: left; display: inline;  border: 1px solid #eee; width: 300px; white-space: nowrap;}
 	.percentage { float: left; background-color: #eef;  font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;  font-size: 0.65em;  padding: 5px;  margin-right: }
@@ -91,24 +91,24 @@ 
 	function paintCoverage()
 	{
 		$dir = dirname(__FILE__);
-		if(count($this->coverage) > 0)
+		if (count($this->coverage) > 0)
 			print '<h2>Code Coverage</h2>';
 
 
 		ksort($this->coverage);
 
 		$details = array();
-		foreach($this->coverage as $file => $coverage)
+		foreach ($this->coverage as $file => $coverage)
 		{
-			if(is_int(strpos($file, $dir)) == false
+			if (is_int(strpos($file, $dir)) == false
 			&& is_int(strpos($file, 'simpletest')) == false
 			&& is_int(strpos($file, $this->base_dir)))
 			{
 				$total = HTMLCoverageReport::codelines($file);
 				$executed = count($coverage);
-				$percentage = sprintf('%01d',$executed/$total*100);
+				$percentage = sprintf('%01d', $executed / $total * 100);
 				$width = $percentage * 3;
-				$filename = str_replace($this->base_dir, '',$file);
+				$filename = str_replace($this->base_dir, '', $file);
 				$link = $this->constructURL($filename, $coverage);
 
 				$detail['total'] = $total;
@@ -120,9 +120,9 @@ 
 			}
 		}
 		krsort($details);
-		foreach($details as $percentage => $files)
+		foreach ($details as $percentage => $files)
 		{
-			foreach($files as $detail)
+			foreach ($files as $detail)
 			{
 				$total = $detail['total'];
 				$executed = $detail['executed'];
@@ -145,7 +145,7 @@ 
 	{
 		$file = rawurlencode($file);
 		$lines = implode(',', array_keys($coverage));
-		return $this->painter.'?file='.$file.'&amp;lines='.$lines;
+		return $this->painter . '?file=' . $file . '&amp;lines=' . $lines;
 	}
 }
 
@@ -168,14 +168,14 @@ 
 		$this->paintHeader($this->name);
 
 		$contents = file($this->file);
-		foreach($contents as $count => $line)
+		foreach ($contents as $count => $line)
 		{
-			$num = ($count+1);
-			$line = preg_replace("/\\n|\\r/",'',$line);
+			$num = ($count + 1);
+			$line = preg_replace("/\\n|\\r/", '', $line);
 			$line = htmlspecialchars($line);
-			$line = str_replace(' ','&nbsp;',$line);
-			$line = str_replace("\t",'&nbsp;&nbsp;&nbsp;&nbsp;',$line);
-			if(in_array($count+1, $this->lines))
+			$line = str_replace(' ', '&nbsp;', $line);
+			$line = str_replace("\t", '&nbsp;&nbsp;&nbsp;&nbsp;', $line);
+			if (in_array($count + 1, $this->lines))
 			echo "<div class=\"highlight\"><tt>$num $line</tt></div>\n";
 			else
 			echo "<tt>$num $line</tt><br />\n";
@@ -184,14 +184,14 @@ 
 		$this->paintFooter();
 	}
 
-	function paintHeader($file, $charset="UTF-8")
+	function paintHeader($file, $charset = "UTF-8")
 	{
 		$total = $this->codelines($this->file);
 		$executed = count($this->lines);
-		$percentage = sprintf('%01.2f',$executed/$total*100);
+		$percentage = sprintf('%01.2f', $executed / $total * 100);
 
 		$this->sendNoCacheHeaders();
-		header('Content-Type: text/html Charset='.$charset);
+		header('Content-Type: text/html Charset=' . $charset);
 		print "<html>\n<head>\n<title>Code Coverage: $file</title>\n";
 		print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset={$charset}\"/>";
 		print "<style type=\"text/css\">\n";
@@ -247,16 +247,16 @@ 
 			}
 		}
 
-		$lines =  preg_replace('/\\n\s*$/m',"",$lines);
-		$codelines = explode("\n",$lines);
+		$lines = preg_replace('/\\n\s*$/m', "", $lines);
+		$codelines = explode("\n", $lines);
 		$count = 0;
 		$patterns[] = '^\s*{\s*$';
 		$patterns[] = '<\?';
 		$patterns[] = '^\s*(private|protected|public)\s+\$';
-		$pattern = '/'.implode('|', $patterns).'/';
-		foreach($codelines as $line)
+		$pattern = '/' . implode('|', $patterns) . '/';
+		foreach ($codelines as $line)
 		{
-			if(!preg_match($pattern, $line))
+			if (!preg_match($pattern, $line))
 				$count++;
 		}
 		return $count;

Braces +18 added lines, -14 removed lines

@@ -1,9 +1,10 @@ 
 <?php
 
-if (!defined('T_ML_COMMENT'))
+if (!defined('T_ML_COMMENT')) {
 	define('T_ML_COMMENT', T_COMMENT);
-else
+} else {
 	define('T_DOC_COMMENT', T_ML_COMMENT);
+}
 
 class HtmlReporterWithCoverage extends HtmlReporter
 {
@@ -32,8 +33,9 @@ 
 		print "<h1>$test_name</h1>\n";
 		flush();
 
-		if (extension_loaded('xdebug'))
-			xdebug_start_code_coverage(XDEBUG_CC_UNUSED);
+		if (extension_loaded('xdebug')) {
+					xdebug_start_code_coverage(XDEBUG_CC_UNUSED);
+		}
 
 	}
 
@@ -91,8 +93,9 @@ 
 	function paintCoverage()
 	{
 		$dir = dirname(__FILE__);
-		if(count($this->coverage) > 0)
-			print '<h2>Code Coverage</h2>';
+		if(count($this->coverage) > 0) {
+					print '<h2>Code Coverage</h2>';
+		}
 
 
 		ksort($this->coverage);
@@ -175,10 +178,11 @@ 
 			$line = htmlspecialchars($line);
 			$line = str_replace(' ','&nbsp;',$line);
 			$line = str_replace("\t",'&nbsp;&nbsp;&nbsp;&nbsp;',$line);
-			if(in_array($count+1, $this->lines))
-			echo "<div class=\"highlight\"><tt>$num $line</tt></div>\n";
-			else
-			echo "<tt>$num $line</tt><br />\n";
+			if(in_array($count+1, $this->lines)) {
+						echo "<div class=\"highlight\"><tt>$num $line</tt></div>\n";
+			} else {
+						echo "<tt>$num $line</tt><br />\n";
+			}
 		}
 
 		$this->paintFooter();
@@ -224,8 +228,7 @@ 
 			{
 				// simple 1-character token
 				$lines .= $token;
-			}
-			else
+			} else
 			{
 					// token array
 				list($id, $text) = $token;
@@ -256,8 +259,9 @@ 
 		$pattern = '/'.implode('|', $patterns).'/';
 		foreach($codelines as $line)
 		{
-			if(!preg_match($pattern, $line))
-				$count++;
+			if(!preg_match($pattern, $line)) {
+							$count++;
+			}
 		}
 		return $count;
 		//var_dump($codelines);

tests/test_tools/simpletest/http.php

Doc Comments +3 added lines, -13 removed lines

@@ -135,9 +135,6 @@ 
         /**
          *    Creates the first line which is the actual request.
          *    @param string $method   HTTP request method, usually GET.
-         *    @param SimpleUrl $url   URL as object.
-         *    @return string          Request line content.
-         *    @access protected
          */
         function _getRequestLine($method) {
             $url = $this->getUrl();
@@ -149,9 +146,6 @@ 
 
         /**
          *    Creates the host part of the request.
-         *    @param SimpleUrl $url   URL as object.
-         *    @return string          Host line content.
-         *    @access protected
          */
         function _getHostLine() {
             $host = 'Host: ' . $this->_proxy->getHost();
@@ -235,10 +229,6 @@ 
         /**
          *    Sends the headers.
          *    @param SimpleSocket $socket           Open socket.
-         *    @param string $method                 HTTP request method,
-         *                                          usually GET.
-         *    @param SimpleFormEncoding $encoding   Content to send with request.
-         *    @access private
          */
         function _dispatchRequest($socket, $encoding) {
             foreach ($this->_headers as $header_line) {
@@ -323,7 +313,7 @@ 
 
         /**
          *    Accessor for parsed HTTP protocol version.
-         *    @return integer           HTTP error code.
+         *    @return false|string           HTTP error code.
          *    @access public
          */
         function getHttpVersion() {
@@ -565,7 +555,7 @@ 
         /**
          *    Accessor for the content after the last
          *    header line.
-         *    @return string           All content.
+         *    @return boolean           All content.
          *    @access public
          */
         function getContent() {
@@ -575,7 +565,7 @@ 
         /**
          *    Accessor for header block. The response is the
          *    combination of this and the content.
-         *    @return SimpleHeaders        Wrapped header block.
+         *    @return SimpleHttpHeaders        Wrapped header block.
          *    @access public
          */
         function getHeaders() {

Indentation +610 added lines, -610 removed lines

@@ -1,623 +1,623 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	WebTester
-     *	@version	$Id: http.php 1398 2006-09-08 19:31:03Z xue $
-     */
-
-    /**#@+
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	WebTester
+	 *	@version	$Id: http.php 1398 2006-09-08 19:31:03Z xue $
+	 */
+
+	/**#@+
      *	include other SimpleTest class files
      */
-    require_once(dirname(__FILE__) . '/socket.php');
-    require_once(dirname(__FILE__) . '/cookies.php');
-    require_once(dirname(__FILE__) . '/url.php');
-    /**#@-*/
-
-    /**
-     *    Creates HTTP headers for the end point of
-     *    a HTTP request.
+	require_once(dirname(__FILE__) . '/socket.php');
+	require_once(dirname(__FILE__) . '/cookies.php');
+	require_once(dirname(__FILE__) . '/url.php');
+	/**#@-*/
+
+	/**
+	 *    Creates HTTP headers for the end point of
+	 *    a HTTP request.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleRoute {
-        protected $_url;
-
-        /**
-         *    Sets the target URL.
-         *    @param SimpleUrl $url   URL as object.
-         *    @access public
-         */
-        function SimpleRoute($url) {
-            $this->_url = $url;
-        }
-
-        /**
-         *    Resource name.
-         *    @return SimpleUrl        Current url.
-         *    @access protected
-         */
-        function getUrl() {
-            return $this->_url;
-        }
-
-        /**
-         *    Creates the first line which is the actual request.
-         *    @param string $method   HTTP request method, usually GET.
-         *    @return string          Request line content.
-         *    @access protected
-         */
-        function _getRequestLine($method) {
-            return $method . ' ' . $this->_url->getPath() .
-                    $this->_url->getEncodedRequest() . ' HTTP/1.0';
-        }
-
-        /**
-         *    Creates the host part of the request.
-         *    @return string          Host line content.
-         *    @access protected
-         */
-        function _getHostLine() {
-            $line = 'Host: ' . $this->_url->getHost();
-            if ($this->_url->getPort()) {
-                $line .= ':' . $this->_url->getPort();
-            }
-            return $line;
-        }
-
-        /**
-         *    Opens a socket to the route.
-         *    @param string $method      HTTP request method, usually GET.
-         *    @param integer $timeout    Connection timeout.
-         *    @return SimpleSocket       New socket.
-         *    @access public
-         */
-        function &createConnection($method, $timeout) {
-            $default_port = ('https' == $this->_url->getScheme()) ? 443 : 80;
-            $socket = $this->_createSocket(
-                    $this->_url->getScheme() ? $this->_url->getScheme() : 'http',
-                    $this->_url->getHost(),
-                    $this->_url->getPort() ? $this->_url->getPort() : $default_port,
-                    $timeout);
-            if (! $socket->isError()) {
-                $socket->write($this->_getRequestLine($method) . "\r\n");
-                $socket->write($this->_getHostLine() . "\r\n");
-                $socket->write("Connection: close\r\n");
-            }
-            return $socket;
-        }
-
-        /**
-         *    Factory for socket.
-         *    @param string $scheme                   Protocol to use.
-         *    @param string $host                     Hostname to connect to.
-         *    @param integer $port                    Remote port.
-         *    @param integer $timeout                 Connection timeout.
-         *    @return SimpleSocket/SimpleSecureSocket New socket.
-         *    @access protected
-         */
-        function &_createSocket($scheme, $host, $port, $timeout) {
-            if (in_array($scheme, array('https'))) {
-                $socket = new SimpleSecureSocket($host, $port, $timeout);
-            } else {
-                $socket = new SimpleSocket($host, $port, $timeout);
-            }
-            return $socket;
-        }
-    }
-
-    /**
-     *    Creates HTTP headers for the end point of
-     *    a HTTP request via a proxy server.
+	 */
+	class SimpleRoute {
+		protected $_url;
+
+		/**
+		 *    Sets the target URL.
+		 *    @param SimpleUrl $url   URL as object.
+		 *    @access public
+		 */
+		function SimpleRoute($url) {
+			$this->_url = $url;
+		}
+
+		/**
+		 *    Resource name.
+		 *    @return SimpleUrl        Current url.
+		 *    @access protected
+		 */
+		function getUrl() {
+			return $this->_url;
+		}
+
+		/**
+		 *    Creates the first line which is the actual request.
+		 *    @param string $method   HTTP request method, usually GET.
+		 *    @return string          Request line content.
+		 *    @access protected
+		 */
+		function _getRequestLine($method) {
+			return $method . ' ' . $this->_url->getPath() .
+					$this->_url->getEncodedRequest() . ' HTTP/1.0';
+		}
+
+		/**
+		 *    Creates the host part of the request.
+		 *    @return string          Host line content.
+		 *    @access protected
+		 */
+		function _getHostLine() {
+			$line = 'Host: ' . $this->_url->getHost();
+			if ($this->_url->getPort()) {
+				$line .= ':' . $this->_url->getPort();
+			}
+			return $line;
+		}
+
+		/**
+		 *    Opens a socket to the route.
+		 *    @param string $method      HTTP request method, usually GET.
+		 *    @param integer $timeout    Connection timeout.
+		 *    @return SimpleSocket       New socket.
+		 *    @access public
+		 */
+		function &createConnection($method, $timeout) {
+			$default_port = ('https' == $this->_url->getScheme()) ? 443 : 80;
+			$socket = $this->_createSocket(
+					$this->_url->getScheme() ? $this->_url->getScheme() : 'http',
+					$this->_url->getHost(),
+					$this->_url->getPort() ? $this->_url->getPort() : $default_port,
+					$timeout);
+			if (! $socket->isError()) {
+				$socket->write($this->_getRequestLine($method) . "\r\n");
+				$socket->write($this->_getHostLine() . "\r\n");
+				$socket->write("Connection: close\r\n");
+			}
+			return $socket;
+		}
+
+		/**
+		 *    Factory for socket.
+		 *    @param string $scheme                   Protocol to use.
+		 *    @param string $host                     Hostname to connect to.
+		 *    @param integer $port                    Remote port.
+		 *    @param integer $timeout                 Connection timeout.
+		 *    @return SimpleSocket/SimpleSecureSocket New socket.
+		 *    @access protected
+		 */
+		function &_createSocket($scheme, $host, $port, $timeout) {
+			if (in_array($scheme, array('https'))) {
+				$socket = new SimpleSecureSocket($host, $port, $timeout);
+			} else {
+				$socket = new SimpleSocket($host, $port, $timeout);
+			}
+			return $socket;
+		}
+	}
+
+	/**
+	 *    Creates HTTP headers for the end point of
+	 *    a HTTP request via a proxy server.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleProxyRoute extends SimpleRoute {
-        protected $_proxy;
-        protected $_username;
-        protected $_password;
-
-        /**
-         *    Stashes the proxy address.
-         *    @param SimpleUrl $url     URL as object.
-         *    @param string $proxy      Proxy URL.
-         *    @param string $username   Username for autentication.
-         *    @param string $password   Password for autentication.
-         *    @access public
-         */
-        function SimpleProxyRoute($url, $proxy, $username = false, $password = false) {
-            $this->SimpleRoute($url);
-            $this->_proxy = $proxy;
-            $this->_username = $username;
-            $this->_password = $password;
-        }
-
-        /**
-         *    Creates the first line which is the actual request.
-         *    @param string $method   HTTP request method, usually GET.
-         *    @param SimpleUrl $url   URL as object.
-         *    @return string          Request line content.
-         *    @access protected
-         */
-        function _getRequestLine($method) {
-            $url = $this->getUrl();
-            $scheme = $url->getScheme() ? $url->getScheme() : 'http';
-            $port = $url->getPort() ? ':' . $url->getPort() : '';
-            return $method . ' ' . $scheme . '://' . $url->getHost() . $port .
-                    $url->getPath() . $url->getEncodedRequest() . ' HTTP/1.0';
-        }
-
-        /**
-         *    Creates the host part of the request.
-         *    @param SimpleUrl $url   URL as object.
-         *    @return string          Host line content.
-         *    @access protected
-         */
-        function _getHostLine() {
-            $host = 'Host: ' . $this->_proxy->getHost();
-            $port = $this->_proxy->getPort() ? $this->_proxy->getPort() : 8080;
-            return "$host:$port";
-        }
-
-        /**
-         *    Opens a socket to the route.
-         *    @param string $method       HTTP request method, usually GET.
-         *    @param integer $timeout     Connection timeout.
-         *    @return SimpleSocket        New socket.
-         *    @access public
-         */
-        function &createConnection($method, $timeout) {
-            $socket = $this->_createSocket(
-                    $this->_proxy->getScheme() ? $this->_proxy->getScheme() : 'http',
-                    $this->_proxy->getHost(),
-                    $this->_proxy->getPort() ? $this->_proxy->getPort() : 8080,
-                    $timeout);
-            if ($socket->isError()) {
-                return $socket;
-            }
-            $socket->write($this->_getRequestLine($method) . "\r\n");
-            $socket->write($this->_getHostLine() . "\r\n");
-            if ($this->_username && $this->_password) {
-                $socket->write('Proxy-Authorization: Basic ' .
-                        base64_encode($this->_username . ':' . $this->_password) .
-                        "\r\n");
-            }
-            $socket->write("Connection: close\r\n");
-            return $socket;
-        }
-    }
-
-    /**
-     *    HTTP request for a web page. Factory for
-     *    HttpResponse object.
+	 */
+	class SimpleProxyRoute extends SimpleRoute {
+		protected $_proxy;
+		protected $_username;
+		protected $_password;
+
+		/**
+		 *    Stashes the proxy address.
+		 *    @param SimpleUrl $url     URL as object.
+		 *    @param string $proxy      Proxy URL.
+		 *    @param string $username   Username for autentication.
+		 *    @param string $password   Password for autentication.
+		 *    @access public
+		 */
+		function SimpleProxyRoute($url, $proxy, $username = false, $password = false) {
+			$this->SimpleRoute($url);
+			$this->_proxy = $proxy;
+			$this->_username = $username;
+			$this->_password = $password;
+		}
+
+		/**
+		 *    Creates the first line which is the actual request.
+		 *    @param string $method   HTTP request method, usually GET.
+		 *    @param SimpleUrl $url   URL as object.
+		 *    @return string          Request line content.
+		 *    @access protected
+		 */
+		function _getRequestLine($method) {
+			$url = $this->getUrl();
+			$scheme = $url->getScheme() ? $url->getScheme() : 'http';
+			$port = $url->getPort() ? ':' . $url->getPort() : '';
+			return $method . ' ' . $scheme . '://' . $url->getHost() . $port .
+					$url->getPath() . $url->getEncodedRequest() . ' HTTP/1.0';
+		}
+
+		/**
+		 *    Creates the host part of the request.
+		 *    @param SimpleUrl $url   URL as object.
+		 *    @return string          Host line content.
+		 *    @access protected
+		 */
+		function _getHostLine() {
+			$host = 'Host: ' . $this->_proxy->getHost();
+			$port = $this->_proxy->getPort() ? $this->_proxy->getPort() : 8080;
+			return "$host:$port";
+		}
+
+		/**
+		 *    Opens a socket to the route.
+		 *    @param string $method       HTTP request method, usually GET.
+		 *    @param integer $timeout     Connection timeout.
+		 *    @return SimpleSocket        New socket.
+		 *    @access public
+		 */
+		function &createConnection($method, $timeout) {
+			$socket = $this->_createSocket(
+					$this->_proxy->getScheme() ? $this->_proxy->getScheme() : 'http',
+					$this->_proxy->getHost(),
+					$this->_proxy->getPort() ? $this->_proxy->getPort() : 8080,
+					$timeout);
+			if ($socket->isError()) {
+				return $socket;
+			}
+			$socket->write($this->_getRequestLine($method) . "\r\n");
+			$socket->write($this->_getHostLine() . "\r\n");
+			if ($this->_username && $this->_password) {
+				$socket->write('Proxy-Authorization: Basic ' .
+						base64_encode($this->_username . ':' . $this->_password) .
+						"\r\n");
+			}
+			$socket->write("Connection: close\r\n");
+			return $socket;
+		}
+	}
+
+	/**
+	 *    HTTP request for a web page. Factory for
+	 *    HttpResponse object.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleHttpRequest {
-        protected $_route;
-        protected $_encoding;
-        protected $_headers;
-        protected $_cookies;
-
-        /**
-         *    Builds the socket request from the different pieces.
-         *    These include proxy information, URL, cookies, headers,
-         *    request method and choice of encoding.
-         *    @param SimpleRoute $route              Request route.
-         *    @param SimpleFormEncoding $encoding    Content to send with
-         *                                           request.
-         *    @access public
-         */
-        function SimpleHttpRequest($route, $encoding) {
-            $this->_route = $route;
-            $this->_encoding = $encoding;
-            $this->_headers = array();
-            $this->_cookies = array();
-        }
-
-        /**
-         *    Dispatches the content to the route's socket.
-         *    @param integer $timeout      Connection timeout.
-         *    @return SimpleHttpResponse   A response which may only have
-         *                                 an error, but hopefully has a
-         *                                 complete web page.
-         *    @access public
-         */
-        function &fetch($timeout) {
-            $socket = $this->_route->createConnection($this->_encoding->getMethod(), $timeout);
-            if (! $socket->isError()) {
-                $this->_dispatchRequest($socket, $this->_encoding);
-            }
-            $response = $this->_createResponse($socket);
-            return $response;
-        }
-
-        /**
-         *    Sends the headers.
-         *    @param SimpleSocket $socket           Open socket.
-         *    @param string $method                 HTTP request method,
-         *                                          usually GET.
-         *    @param SimpleFormEncoding $encoding   Content to send with request.
-         *    @access private
-         */
-        function _dispatchRequest($socket, $encoding) {
-            foreach ($this->_headers as $header_line) {
-                $socket->write($header_line . "\r\n");
-            }
-            if (count($this->_cookies) > 0) {
-                $socket->write("Cookie: " . implode(";", $this->_cookies) . "\r\n");
-            }
-            $encoding->writeHeadersTo($socket);
-            $socket->write("\r\n");
-            $encoding->writeTo($socket);
-        }
-
-        /**
-         *    Adds a header line to the request.
-         *    @param string $header_line    Text of full header line.
-         *    @access public
-         */
-        function addHeaderLine($header_line) {
-            $this->_headers[] = $header_line;
-        }
-
-        /**
-         *    Reads all the relevant cookies from the
-         *    cookie jar.
-         *    @param SimpleCookieJar $jar     Jar to read
-         *    @param SimpleUrl $url           Url to use for scope.
-         *    @access public
-         */
-        function readCookiesFromJar($jar, $url) {
-            $this->_cookies = $jar->selectAsPairs($url);
-        }
-
-        /**
-         *    Wraps the socket in a response parser.
-         *    @param SimpleSocket $socket   Responding socket.
-         *    @return SimpleHttpResponse    Parsed response object.
-         *    @access protected
-         */
-        function &_createResponse($socket) {
-            $response = new SimpleHttpResponse(
-                    $socket,
-                    $this->_route->getUrl(),
-                    $this->_encoding);
-            return $response;
-        }
-    }
-
-    /**
-     *    Collection of header lines in the response.
+	 */
+	class SimpleHttpRequest {
+		protected $_route;
+		protected $_encoding;
+		protected $_headers;
+		protected $_cookies;
+
+		/**
+		 *    Builds the socket request from the different pieces.
+		 *    These include proxy information, URL, cookies, headers,
+		 *    request method and choice of encoding.
+		 *    @param SimpleRoute $route              Request route.
+		 *    @param SimpleFormEncoding $encoding    Content to send with
+		 *                                           request.
+		 *    @access public
+		 */
+		function SimpleHttpRequest($route, $encoding) {
+			$this->_route = $route;
+			$this->_encoding = $encoding;
+			$this->_headers = array();
+			$this->_cookies = array();
+		}
+
+		/**
+		 *    Dispatches the content to the route's socket.
+		 *    @param integer $timeout      Connection timeout.
+		 *    @return SimpleHttpResponse   A response which may only have
+		 *                                 an error, but hopefully has a
+		 *                                 complete web page.
+		 *    @access public
+		 */
+		function &fetch($timeout) {
+			$socket = $this->_route->createConnection($this->_encoding->getMethod(), $timeout);
+			if (! $socket->isError()) {
+				$this->_dispatchRequest($socket, $this->_encoding);
+			}
+			$response = $this->_createResponse($socket);
+			return $response;
+		}
+
+		/**
+		 *    Sends the headers.
+		 *    @param SimpleSocket $socket           Open socket.
+		 *    @param string $method                 HTTP request method,
+		 *                                          usually GET.
+		 *    @param SimpleFormEncoding $encoding   Content to send with request.
+		 *    @access private
+		 */
+		function _dispatchRequest($socket, $encoding) {
+			foreach ($this->_headers as $header_line) {
+				$socket->write($header_line . "\r\n");
+			}
+			if (count($this->_cookies) > 0) {
+				$socket->write("Cookie: " . implode(";", $this->_cookies) . "\r\n");
+			}
+			$encoding->writeHeadersTo($socket);
+			$socket->write("\r\n");
+			$encoding->writeTo($socket);
+		}
+
+		/**
+		 *    Adds a header line to the request.
+		 *    @param string $header_line    Text of full header line.
+		 *    @access public
+		 */
+		function addHeaderLine($header_line) {
+			$this->_headers[] = $header_line;
+		}
+
+		/**
+		 *    Reads all the relevant cookies from the
+		 *    cookie jar.
+		 *    @param SimpleCookieJar $jar     Jar to read
+		 *    @param SimpleUrl $url           Url to use for scope.
+		 *    @access public
+		 */
+		function readCookiesFromJar($jar, $url) {
+			$this->_cookies = $jar->selectAsPairs($url);
+		}
+
+		/**
+		 *    Wraps the socket in a response parser.
+		 *    @param SimpleSocket $socket   Responding socket.
+		 *    @return SimpleHttpResponse    Parsed response object.
+		 *    @access protected
+		 */
+		function &_createResponse($socket) {
+			$response = new SimpleHttpResponse(
+					$socket,
+					$this->_route->getUrl(),
+					$this->_encoding);
+			return $response;
+		}
+	}
+
+	/**
+	 *    Collection of header lines in the response.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleHttpHeaders {
-        protected $_raw_headers;
-        protected $_response_code;
-        protected $_http_version;
-        protected $_mime_type;
-        protected $_location;
-        protected $_cookies;
-        protected $_authentication;
-        protected $_realm;
-
-        /**
-         *    Parses the incoming header block.
-         *    @param string $headers     Header block.
-         *    @access public
-         */
-        function SimpleHttpHeaders($headers) {
-            $this->_raw_headers = $headers;
-            $this->_response_code = false;
-            $this->_http_version = false;
-            $this->_mime_type = '';
-            $this->_location = false;
-            $this->_cookies = array();
-            $this->_authentication = false;
-            $this->_realm = false;
-            foreach (split("\r\n", $headers) as $header_line) {
-                $this->_parseHeaderLine($header_line);
-            }
-        }
-
-        /**
-         *    Accessor for parsed HTTP protocol version.
-         *    @return integer           HTTP error code.
-         *    @access public
-         */
-        function getHttpVersion() {
-            return $this->_http_version;
-        }
-
-        /**
-         *    Accessor for raw header block.
-         *    @return string        All headers as raw string.
-         *    @access public
-         */
-        function getRaw() {
-            return $this->_raw_headers;
-        }
-
-        /**
-         *    Accessor for parsed HTTP error code.
-         *    @return integer           HTTP error code.
-         *    @access public
-         */
-        function getResponseCode() {
-            return (integer)$this->_response_code;
-        }
-
-        /**
-         *    Returns the redirected URL or false if
-         *    no redirection.
-         *    @return string      URL or false for none.
-         *    @access public
-         */
-        function getLocation() {
-            return $this->_location;
-        }
-
-        /**
-         *    Test to see if the response is a valid redirect.
-         *    @return boolean       True if valid redirect.
-         *    @access public
-         */
-        function isRedirect() {
-            return in_array($this->_response_code, array(301, 302, 303, 307)) &&
-                    (boolean)$this->getLocation();
-        }
-
-        /**
-         *    Test to see if the response is an authentication
-         *    challenge.
-         *    @return boolean       True if challenge.
-         *    @access public
-         */
-        function isChallenge() {
-            return ($this->_response_code == 401) &&
-                    (boolean)$this->_authentication &&
-                    (boolean)$this->_realm;
-        }
-
-        /**
-         *    Accessor for MIME type header information.
-         *    @return string           MIME type.
-         *    @access public
-         */
-        function getMimeType() {
-            return $this->_mime_type;
-        }
-
-        /**
-         *    Accessor for authentication type.
-         *    @return string        Type.
-         *    @access public
-         */
-        function getAuthentication() {
-            return $this->_authentication;
-        }
-
-        /**
-         *    Accessor for security realm.
-         *    @return string        Realm.
-         *    @access public
-         */
-        function getRealm() {
-            return $this->_realm;
-        }
-
-        /**
-         *    Writes new cookies to the cookie jar.
-         *    @param SimpleCookieJar $jar   Jar to write to.
-         *    @param SimpleUrl $url         Host and path to write under.
-         *    @access public
-         */
-        function writeCookiesToJar($jar, $url) {
-            foreach ($this->_cookies as $cookie) {
-                $jar->setCookie(
-                        $cookie->getName(),
-                        $cookie->getValue(),
-                        $url->getHost(),
-                        $cookie->getPath(),
-                        $cookie->getExpiry());
-            }
-        }
-
-        /**
-         *    Called on each header line to accumulate the held
-         *    data within the class.
-         *    @param string $header_line        One line of header.
-         *    @access protected
-         */
-        function _parseHeaderLine($header_line) {
-            if (preg_match('/HTTP\/(\d+\.\d+)\s+(\d+)/i', $header_line, $matches)) {
-                $this->_http_version = $matches[1];
-                $this->_response_code = $matches[2];
-            }
-            if (preg_match('/Content-type:\s*(.*)/i', $header_line, $matches)) {
-                $this->_mime_type = trim($matches[1]);
-            }
-            if (preg_match('/Location:\s*(.*)/i', $header_line, $matches)) {
-                $this->_location = trim($matches[1]);
-            }
-            if (preg_match('/Set-cookie:(.*)/i', $header_line, $matches)) {
-                $this->_cookies[] = $this->_parseCookie($matches[1]);
-            }
-            if (preg_match('/WWW-Authenticate:\s+(\S+)\s+realm=\"(.*?)\"/i', $header_line, $matches)) {
-                $this->_authentication = $matches[1];
-                $this->_realm = trim($matches[2]);
-            }
-        }
-
-        /**
-         *    Parse the Set-cookie content.
-         *    @param string $cookie_line    Text after "Set-cookie:"
-         *    @return SimpleCookie          New cookie object.
-         *    @access private
-         */
-        function _parseCookie($cookie_line) {
-            $parts = split(";", $cookie_line);
-            $cookie = array();
-            preg_match('/\s*(.*?)\s*=(.*)/', array_shift($parts), $cookie);
-            foreach ($parts as $part) {
-                if (preg_match('/\s*(.*?)\s*=(.*)/', $part, $matches)) {
-                    $cookie[$matches[1]] = trim($matches[2]);
-                }
-            }
-            return new SimpleCookie(
-                    $cookie[1],
-                    trim($cookie[2]),
-                    isset($cookie["path"]) ? $cookie["path"] : "",
-                    isset($cookie["expires"]) ? $cookie["expires"] : false);
-        }
-    }
-
-    /**
-     *    Basic HTTP response.
+	 */
+	class SimpleHttpHeaders {
+		protected $_raw_headers;
+		protected $_response_code;
+		protected $_http_version;
+		protected $_mime_type;
+		protected $_location;
+		protected $_cookies;
+		protected $_authentication;
+		protected $_realm;
+
+		/**
+		 *    Parses the incoming header block.
+		 *    @param string $headers     Header block.
+		 *    @access public
+		 */
+		function SimpleHttpHeaders($headers) {
+			$this->_raw_headers = $headers;
+			$this->_response_code = false;
+			$this->_http_version = false;
+			$this->_mime_type = '';
+			$this->_location = false;
+			$this->_cookies = array();
+			$this->_authentication = false;
+			$this->_realm = false;
+			foreach (split("\r\n", $headers) as $header_line) {
+				$this->_parseHeaderLine($header_line);
+			}
+		}
+
+		/**
+		 *    Accessor for parsed HTTP protocol version.
+		 *    @return integer           HTTP error code.
+		 *    @access public
+		 */
+		function getHttpVersion() {
+			return $this->_http_version;
+		}
+
+		/**
+		 *    Accessor for raw header block.
+		 *    @return string        All headers as raw string.
+		 *    @access public
+		 */
+		function getRaw() {
+			return $this->_raw_headers;
+		}
+
+		/**
+		 *    Accessor for parsed HTTP error code.
+		 *    @return integer           HTTP error code.
+		 *    @access public
+		 */
+		function getResponseCode() {
+			return (integer)$this->_response_code;
+		}
+
+		/**
+		 *    Returns the redirected URL or false if
+		 *    no redirection.
+		 *    @return string      URL or false for none.
+		 *    @access public
+		 */
+		function getLocation() {
+			return $this->_location;
+		}
+
+		/**
+		 *    Test to see if the response is a valid redirect.
+		 *    @return boolean       True if valid redirect.
+		 *    @access public
+		 */
+		function isRedirect() {
+			return in_array($this->_response_code, array(301, 302, 303, 307)) &&
+					(boolean)$this->getLocation();
+		}
+
+		/**
+		 *    Test to see if the response is an authentication
+		 *    challenge.
+		 *    @return boolean       True if challenge.
+		 *    @access public
+		 */
+		function isChallenge() {
+			return ($this->_response_code == 401) &&
+					(boolean)$this->_authentication &&
+					(boolean)$this->_realm;
+		}
+
+		/**
+		 *    Accessor for MIME type header information.
+		 *    @return string           MIME type.
+		 *    @access public
+		 */
+		function getMimeType() {
+			return $this->_mime_type;
+		}
+
+		/**
+		 *    Accessor for authentication type.
+		 *    @return string        Type.
+		 *    @access public
+		 */
+		function getAuthentication() {
+			return $this->_authentication;
+		}
+
+		/**
+		 *    Accessor for security realm.
+		 *    @return string        Realm.
+		 *    @access public
+		 */
+		function getRealm() {
+			return $this->_realm;
+		}
+
+		/**
+		 *    Writes new cookies to the cookie jar.
+		 *    @param SimpleCookieJar $jar   Jar to write to.
+		 *    @param SimpleUrl $url         Host and path to write under.
+		 *    @access public
+		 */
+		function writeCookiesToJar($jar, $url) {
+			foreach ($this->_cookies as $cookie) {
+				$jar->setCookie(
+						$cookie->getName(),
+						$cookie->getValue(),
+						$url->getHost(),
+						$cookie->getPath(),
+						$cookie->getExpiry());
+			}
+		}
+
+		/**
+		 *    Called on each header line to accumulate the held
+		 *    data within the class.
+		 *    @param string $header_line        One line of header.
+		 *    @access protected
+		 */
+		function _parseHeaderLine($header_line) {
+			if (preg_match('/HTTP\/(\d+\.\d+)\s+(\d+)/i', $header_line, $matches)) {
+				$this->_http_version = $matches[1];
+				$this->_response_code = $matches[2];
+			}
+			if (preg_match('/Content-type:\s*(.*)/i', $header_line, $matches)) {
+				$this->_mime_type = trim($matches[1]);
+			}
+			if (preg_match('/Location:\s*(.*)/i', $header_line, $matches)) {
+				$this->_location = trim($matches[1]);
+			}
+			if (preg_match('/Set-cookie:(.*)/i', $header_line, $matches)) {
+				$this->_cookies[] = $this->_parseCookie($matches[1]);
+			}
+			if (preg_match('/WWW-Authenticate:\s+(\S+)\s+realm=\"(.*?)\"/i', $header_line, $matches)) {
+				$this->_authentication = $matches[1];
+				$this->_realm = trim($matches[2]);
+			}
+		}
+
+		/**
+		 *    Parse the Set-cookie content.
+		 *    @param string $cookie_line    Text after "Set-cookie:"
+		 *    @return SimpleCookie          New cookie object.
+		 *    @access private
+		 */
+		function _parseCookie($cookie_line) {
+			$parts = split(";", $cookie_line);
+			$cookie = array();
+			preg_match('/\s*(.*?)\s*=(.*)/', array_shift($parts), $cookie);
+			foreach ($parts as $part) {
+				if (preg_match('/\s*(.*?)\s*=(.*)/', $part, $matches)) {
+					$cookie[$matches[1]] = trim($matches[2]);
+				}
+			}
+			return new SimpleCookie(
+					$cookie[1],
+					trim($cookie[2]),
+					isset($cookie["path"]) ? $cookie["path"] : "",
+					isset($cookie["expires"]) ? $cookie["expires"] : false);
+		}
+	}
+
+	/**
+	 *    Basic HTTP response.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleHttpResponse extends SimpleStickyError {
-        protected $_url;
-        protected $_encoding;
-        protected $_sent;
-        protected $_content;
-        protected $_headers;
-
-        /**
-         *    Constructor. Reads and parses the incoming
-         *    content and headers.
-         *    @param SimpleSocket $socket   Network connection to fetch
-         *                                  response text from.
-         *    @param SimpleUrl $url         Resource name.
-         *    @param mixed $encoding        Record of content sent.
-         *    @access public
-         */
-        function SimpleHttpResponse($socket, $url, $encoding) {
-            $this->SimpleStickyError();
-            $this->_url = $url;
-            $this->_encoding = $encoding;
-            $this->_sent = $socket->getSent();
-            $this->_content = false;
-            $raw = $this->_readAll($socket);
-            if ($socket->isError()) {
-                $this->_setError('Error reading socket [' . $socket->getError() . ']');
-                return;
-            }
-            $this->_parse($raw);
-        }
-
-        /**
-         *    Splits up the headers and the rest of the content.
-         *    @param string $raw    Content to parse.
-         *    @access private
-         */
-        function _parse($raw) {
-            if (! $raw) {
-                $this->_setError('Nothing fetched');
-                $this->_headers = new SimpleHttpHeaders('');
-            } elseif (! strstr($raw, "\r\n\r\n")) {
-                $this->_setError('Could not split headers from content');
-                $this->_headers = new SimpleHttpHeaders($raw);
-            } else {
-                list($headers, $this->_content) = split("\r\n\r\n", $raw, 2);
-                $this->_headers = new SimpleHttpHeaders($headers);
-            }
-        }
-
-        /**
-         *    Original request method.
-         *    @return string        GET, POST or HEAD.
-         *    @access public
-         */
-        function getMethod() {
-            return $this->_encoding->getMethod();
-        }
-
-        /**
-         *    Resource name.
-         *    @return SimpleUrl        Current url.
-         *    @access public
-         */
-        function getUrl() {
-            return $this->_url;
-        }
-
-        /**
-         *    Original request data.
-         *    @return mixed              Sent content.
-         *    @access public
-         */
-        function getRequestData() {
-            return $this->_encoding;
-        }
-
-        /**
-         *    Raw request that was sent down the wire.
-         *    @return string        Bytes actually sent.
-         *    @access public
-         */
-        function getSent() {
-            return $this->_sent;
-        }
-
-        /**
-         *    Accessor for the content after the last
-         *    header line.
-         *    @return string           All content.
-         *    @access public
-         */
-        function getContent() {
-            return $this->_content;
-        }
-
-        /**
-         *    Accessor for header block. The response is the
-         *    combination of this and the content.
-         *    @return SimpleHeaders        Wrapped header block.
-         *    @access public
-         */
-        function getHeaders() {
-            return $this->_headers;
-        }
-
-        /**
-         *    Accessor for any new cookies.
-         *    @return array       List of new cookies.
-         *    @access public
-         */
-        function getNewCookies() {
-            return $this->_headers->getNewCookies();
-        }
-
-        /**
-         *    Reads the whole of the socket output into a
-         *    single string.
-         *    @param SimpleSocket $socket  Unread socket.
-         *    @return string               Raw output if successful
-         *                                 else false.
-         *    @access private
-         */
-        function _readAll($socket) {
-            $all = '';
-            while (! $this->_isLastPacket($next = $socket->read())) {
-                $all .= $next;
-            }
-            return $all;
-        }
-
-        /**
-         *    Test to see if the packet from the socket is the
-         *    last one.
-         *    @param string $packet    Chunk to interpret.
-         *    @return boolean          True if empty or EOF.
-         *    @access private
-         */
-        function _isLastPacket($packet) {
-            if (is_string($packet)) {
-                return $packet === '';
-            }
-            return ! $packet;
-        }
-    }
\ No newline at end of file
+	 */
+	class SimpleHttpResponse extends SimpleStickyError {
+		protected $_url;
+		protected $_encoding;
+		protected $_sent;
+		protected $_content;
+		protected $_headers;
+
+		/**
+		 *    Constructor. Reads and parses the incoming
+		 *    content and headers.
+		 *    @param SimpleSocket $socket   Network connection to fetch
+		 *                                  response text from.
+		 *    @param SimpleUrl $url         Resource name.
+		 *    @param mixed $encoding        Record of content sent.
+		 *    @access public
+		 */
+		function SimpleHttpResponse($socket, $url, $encoding) {
+			$this->SimpleStickyError();
+			$this->_url = $url;
+			$this->_encoding = $encoding;
+			$this->_sent = $socket->getSent();
+			$this->_content = false;
+			$raw = $this->_readAll($socket);
+			if ($socket->isError()) {
+				$this->_setError('Error reading socket [' . $socket->getError() . ']');
+				return;
+			}
+			$this->_parse($raw);
+		}
+
+		/**
+		 *    Splits up the headers and the rest of the content.
+		 *    @param string $raw    Content to parse.
+		 *    @access private
+		 */
+		function _parse($raw) {
+			if (! $raw) {
+				$this->_setError('Nothing fetched');
+				$this->_headers = new SimpleHttpHeaders('');
+			} elseif (! strstr($raw, "\r\n\r\n")) {
+				$this->_setError('Could not split headers from content');
+				$this->_headers = new SimpleHttpHeaders($raw);
+			} else {
+				list($headers, $this->_content) = split("\r\n\r\n", $raw, 2);
+				$this->_headers = new SimpleHttpHeaders($headers);
+			}
+		}
+
+		/**
+		 *    Original request method.
+		 *    @return string        GET, POST or HEAD.
+		 *    @access public
+		 */
+		function getMethod() {
+			return $this->_encoding->getMethod();
+		}
+
+		/**
+		 *    Resource name.
+		 *    @return SimpleUrl        Current url.
+		 *    @access public
+		 */
+		function getUrl() {
+			return $this->_url;
+		}
+
+		/**
+		 *    Original request data.
+		 *    @return mixed              Sent content.
+		 *    @access public
+		 */
+		function getRequestData() {
+			return $this->_encoding;
+		}
+
+		/**
+		 *    Raw request that was sent down the wire.
+		 *    @return string        Bytes actually sent.
+		 *    @access public
+		 */
+		function getSent() {
+			return $this->_sent;
+		}
+
+		/**
+		 *    Accessor for the content after the last
+		 *    header line.
+		 *    @return string           All content.
+		 *    @access public
+		 */
+		function getContent() {
+			return $this->_content;
+		}
+
+		/**
+		 *    Accessor for header block. The response is the
+		 *    combination of this and the content.
+		 *    @return SimpleHeaders        Wrapped header block.
+		 *    @access public
+		 */
+		function getHeaders() {
+			return $this->_headers;
+		}
+
+		/**
+		 *    Accessor for any new cookies.
+		 *    @return array       List of new cookies.
+		 *    @access public
+		 */
+		function getNewCookies() {
+			return $this->_headers->getNewCookies();
+		}
+
+		/**
+		 *    Reads the whole of the socket output into a
+		 *    single string.
+		 *    @param SimpleSocket $socket  Unread socket.
+		 *    @return string               Raw output if successful
+		 *                                 else false.
+		 *    @access private
+		 */
+		function _readAll($socket) {
+			$all = '';
+			while (! $this->_isLastPacket($next = $socket->read())) {
+				$all .= $next;
+			}
+			return $all;
+		}
+
+		/**
+		 *    Test to see if the packet from the socket is the
+		 *    last one.
+		 *    @param string $packet    Chunk to interpret.
+		 *    @return boolean          True if empty or EOF.
+		 *    @access private
+		 */
+		function _isLastPacket($packet) {
+			if (is_string($packet)) {
+				return $packet === '';
+			}
+			return ! $packet;
+		}
+	}
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -79,7 +79,7 @@ 
                     $this->_url->getHost(),
                     $this->_url->getPort() ? $this->_url->getPort() : $default_port,
                     $timeout);
-            if (! $socket->isError()) {
+            if (!$socket->isError()) {
                 $socket->write($this->_getRequestLine($method) . "\r\n");
                 $socket->write($this->_getHostLine() . "\r\n");
                 $socket->write("Connection: close\r\n");
@@ -225,7 +225,7 @@ 
          */
         function &fetch($timeout) {
             $socket = $this->_route->createConnection($this->_encoding->getMethod(), $timeout);
-            if (! $socket->isError()) {
+            if (!$socket->isError()) {
                 $this->_dispatchRequest($socket, $this->_encoding);
             }
             $response = $this->_createResponse($socket);
@@ -345,7 +345,7 @@ 
          *    @access public
          */
         function getResponseCode() {
-            return (integer)$this->_response_code;
+            return (integer) $this->_response_code;
         }
 
         /**
@@ -365,7 +365,7 @@ 
          */
         function isRedirect() {
             return in_array($this->_response_code, array(301, 302, 303, 307)) &&
-                    (boolean)$this->getLocation();
+                    (boolean) $this->getLocation();
         }
 
         /**
@@ -376,8 +376,8 @@ 
          */
         function isChallenge() {
             return ($this->_response_code == 401) &&
-                    (boolean)$this->_authentication &&
-                    (boolean)$this->_realm;
+                    (boolean) $this->_authentication &&
+                    (boolean) $this->_realm;
         }
 
         /**
@@ -514,10 +514,10 @@ 
          *    @access private
          */
         function _parse($raw) {
-            if (! $raw) {
+            if (!$raw) {
                 $this->_setError('Nothing fetched');
                 $this->_headers = new SimpleHttpHeaders('');
-            } elseif (! strstr($raw, "\r\n\r\n")) {
+            } elseif (!strstr($raw, "\r\n\r\n")) {
                 $this->_setError('Could not split headers from content');
                 $this->_headers = new SimpleHttpHeaders($raw);
             } else {
@@ -601,7 +601,7 @@ 
          */
         function _readAll($socket) {
             $all = '';
-            while (! $this->_isLastPacket($next = $socket->read())) {
+            while (!$this->_isLastPacket($next = $socket->read())) {
                 $all .= $next;
             }
             return $all;
@@ -618,6 +618,6 @@ 
             if (is_string($packet)) {
                 return $packet === '';
             }
-            return ! $packet;
+            return !$packet;
         }
     }
\ No newline at end of file