pradosoft / prado

tests/test_tools/simpletest/options.php

Doc Comments +4 added lines, -4 removed lines

@@ -143,7 +143,7 @@ 
 
         /**
          *    Accessor for default proxy host.
-         *    @return string       Proxy URL.
+         *    @return boolean       Proxy URL.
          *    @access public
          */
         function getDefaultProxy() {
@@ -153,7 +153,7 @@ 
 
         /**
          *    Accessor for default proxy username.
-         *    @return string    Proxy username for authentication.
+         *    @return boolean    Proxy username for authentication.
          *    @access public
          */
         function getDefaultProxyUsername() {
@@ -163,7 +163,7 @@ 
 
         /**
          *    Accessor for default proxy password.
-         *    @return string    Proxy password for authentication.
+         *    @return boolean    Proxy password for authentication.
          *    @access public
          */
         function getDefaultProxyPassword() {
@@ -173,7 +173,7 @@ 
 
         /**
          *    Accessor for global registry of options.
-         *    @return hash           All stored values.
+         *    @return string           All stored values.
          *    @access private
          *    @static
          */

Indentation +339 added lines, -339 removed lines

@@ -1,365 +1,365 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@version	$Id: options.php 1532 2006-12-01 12:28:55Z xue $
-     */
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@version	$Id: options.php 1532 2006-12-01 12:28:55Z xue $
+	 */
 
-    /**
-     *    Static global directives and options.
-     *	  @package	SimpleTest
-     */
-    class SimpleTestOptions {
+	/**
+	 *    Static global directives and options.
+	 *	  @package	SimpleTest
+	 */
+	class SimpleTestOptions {
 
-        /**
-         *    Reads the SimpleTest version from the release file.
-         *    @return string        Version string.
-         *    @static
-         *    @access public
-         */
-        static function getVersion() {
-            $content = file(dirname(__FILE__) . '/VERSION');
-            return trim($content[0]);
-        }
+		/**
+		 *    Reads the SimpleTest version from the release file.
+		 *    @return string        Version string.
+		 *    @static
+		 *    @access public
+		 */
+		static function getVersion() {
+			$content = file(dirname(__FILE__) . '/VERSION');
+			return trim($content[0]);
+		}
 
-        /**
-         *    Sets the name of a test case to ignore, usually
-         *    because the class is an abstract case that should
-         *    not be run.
-         *    @param string $class        Add a class to ignore.
-         *    @static
-         *    @access public
-         */
-        static function ignore($class) {
-            $registry =SimpleTestOptions::_getRegistry();
-            $registry['IgnoreList'][] = strtolower($class);
-        }
+		/**
+		 *    Sets the name of a test case to ignore, usually
+		 *    because the class is an abstract case that should
+		 *    not be run.
+		 *    @param string $class        Add a class to ignore.
+		 *    @static
+		 *    @access public
+		 */
+		static function ignore($class) {
+			$registry =SimpleTestOptions::_getRegistry();
+			$registry['IgnoreList'][] = strtolower($class);
+		}
 
-        /**
-         *    Test to see if a test case is in the ignore
-         *    list.
-         *    @param string $class        Class name to test.
-         *    @return boolean             True if should not be run.
-         *    @access public
-         *    @static
-         */
-        static function isIgnored($class) {
-            $registry =SimpleTestOptions::_getRegistry();
-            return in_array(strtolower($class), $registry['IgnoreList']);
-        }
+		/**
+		 *    Test to see if a test case is in the ignore
+		 *    list.
+		 *    @param string $class        Class name to test.
+		 *    @return boolean             True if should not be run.
+		 *    @access public
+		 *    @static
+		 */
+		static function isIgnored($class) {
+			$registry =SimpleTestOptions::_getRegistry();
+			return in_array(strtolower($class), $registry['IgnoreList']);
+		}
 
-        /**
-         *    The base class name is settable here. This is the
-         *    class that a new stub will inherited from.
-         *    To modify the generated stubs simply extend the
-         *    SimpleStub class and set it's name
-         *    with this method before any stubs are generated.
-         *    @param string $stub_base     Server stub class to use.
-         *    @static
-         *    @access public
-         */
-        static function setStubBaseClass($stub_base) {
-            $registry =SimpleTestOptions::_getRegistry();
-            $registry['StubBaseClass'] = $stub_base;
-        }
+		/**
+		 *    The base class name is settable here. This is the
+		 *    class that a new stub will inherited from.
+		 *    To modify the generated stubs simply extend the
+		 *    SimpleStub class and set it's name
+		 *    with this method before any stubs are generated.
+		 *    @param string $stub_base     Server stub class to use.
+		 *    @static
+		 *    @access public
+		 */
+		static function setStubBaseClass($stub_base) {
+			$registry =SimpleTestOptions::_getRegistry();
+			$registry['StubBaseClass'] = $stub_base;
+		}
 
-        /**
-         *    Accessor for the currently set stub base class.
-         *    @return string        Class name to inherit from.
-         *    @static
-         *    @access public
-         */
-        static function getStubBaseClass() {
-            $registry =SimpleTestOptions::_getRegistry();
-            return $registry['StubBaseClass'];
-        }
+		/**
+		 *    Accessor for the currently set stub base class.
+		 *    @return string        Class name to inherit from.
+		 *    @static
+		 *    @access public
+		 */
+		static function getStubBaseClass() {
+			$registry =SimpleTestOptions::_getRegistry();
+			return $registry['StubBaseClass'];
+		}
 
-        /**
-         *    The base class name is settable here. This is the
-         *    class that a new mock will inherited from.
-         *    To modify the generated mocks simply extend the
-         *    SimpleMock class and set it's name
-         *    with this method before any mocks are generated.
-         *    @param string $mock_base        Mock base class to use.
-         *    @static
-         *    @access public
-         */
-        static function setMockBaseClass($mock_base) {
-            $registry =SimpleTestOptions::_getRegistry();
-            $registry['MockBaseClass'] = $mock_base;
-        }
+		/**
+		 *    The base class name is settable here. This is the
+		 *    class that a new mock will inherited from.
+		 *    To modify the generated mocks simply extend the
+		 *    SimpleMock class and set it's name
+		 *    with this method before any mocks are generated.
+		 *    @param string $mock_base        Mock base class to use.
+		 *    @static
+		 *    @access public
+		 */
+		static function setMockBaseClass($mock_base) {
+			$registry =SimpleTestOptions::_getRegistry();
+			$registry['MockBaseClass'] = $mock_base;
+		}
 
-        /**
-         *    Accessor for the currently set mock base class.
-         *    @return string           Class name to inherit from.
-         *    @static
-         *    @access public
-         */
-        static function getMockBaseClass() {
-            $registry =SimpleTestOptions::_getRegistry();
-            return $registry['MockBaseClass'];
-        }
+		/**
+		 *    Accessor for the currently set mock base class.
+		 *    @return string           Class name to inherit from.
+		 *    @static
+		 *    @access public
+		 */
+		static function getMockBaseClass() {
+			$registry =SimpleTestOptions::_getRegistry();
+			return $registry['MockBaseClass'];
+		}
 
-        /**
-         *    Adds additional mock code.
-         *    @param string $code    Extra code that can be added
-         *                           to the partial mocks for
-         *                           extra functionality. Useful
-         *                           when a test tool has overridden
-         *                           the mock base classes.
-         *    @access public
-         */
-        static function addPartialMockCode($code = '') {
-            $registry =SimpleTestOptions::_getRegistry();
-            $registry['AdditionalPartialMockCode'] = $code;
-        }
+		/**
+		 *    Adds additional mock code.
+		 *    @param string $code    Extra code that can be added
+		 *                           to the partial mocks for
+		 *                           extra functionality. Useful
+		 *                           when a test tool has overridden
+		 *                           the mock base classes.
+		 *    @access public
+		 */
+		static function addPartialMockCode($code = '') {
+			$registry =SimpleTestOptions::_getRegistry();
+			$registry['AdditionalPartialMockCode'] = $code;
+		}
 
-        /**
-         *    Accessor for additional partial mock code.
-         *    @return string       Extra code.
-         *    @access public
-         */
-        function getPartialMockCode() {
-            $registry =SimpleTestOptions::_getRegistry();
-            return $registry['AdditionalPartialMockCode'];
-        }
+		/**
+		 *    Accessor for additional partial mock code.
+		 *    @return string       Extra code.
+		 *    @access public
+		 */
+		function getPartialMockCode() {
+			$registry =SimpleTestOptions::_getRegistry();
+			return $registry['AdditionalPartialMockCode'];
+		}
 
-        /**
-         *    Sets proxy to use on all requests for when
-         *    testing from behind a firewall. Set host
-         *    to false to disable. This will take effect
-         *    if there are no other proxy settings.
-         *    @param string $proxy     Proxy host as URL.
-         *    @param string $username  Proxy username for authentication.
-         *    @param string $password  Proxy password for authentication.
-         *    @access public
-         */
-        static function useProxy($proxy, $username = false, $password = false) {
-            $registry =SimpleTestOptions::_getRegistry();
-            $registry['DefaultProxy'] = $proxy;
-            $registry['DefaultProxyUsername'] = $username;
-            $registry['DefaultProxyPassword'] = $password;
-        }
+		/**
+		 *    Sets proxy to use on all requests for when
+		 *    testing from behind a firewall. Set host
+		 *    to false to disable. This will take effect
+		 *    if there are no other proxy settings.
+		 *    @param string $proxy     Proxy host as URL.
+		 *    @param string $username  Proxy username for authentication.
+		 *    @param string $password  Proxy password for authentication.
+		 *    @access public
+		 */
+		static function useProxy($proxy, $username = false, $password = false) {
+			$registry =SimpleTestOptions::_getRegistry();
+			$registry['DefaultProxy'] = $proxy;
+			$registry['DefaultProxyUsername'] = $username;
+			$registry['DefaultProxyPassword'] = $password;
+		}
 
-        /**
-         *    Accessor for default proxy host.
-         *    @return string       Proxy URL.
-         *    @access public
-         */
-        function getDefaultProxy() {
-            $registry =SimpleTestOptions::_getRegistry();
-            return $registry['DefaultProxy'];
-        }
+		/**
+		 *    Accessor for default proxy host.
+		 *    @return string       Proxy URL.
+		 *    @access public
+		 */
+		function getDefaultProxy() {
+			$registry =SimpleTestOptions::_getRegistry();
+			return $registry['DefaultProxy'];
+		}
 
-        /**
-         *    Accessor for default proxy username.
-         *    @return string    Proxy username for authentication.
-         *    @access public
-         */
-        function getDefaultProxyUsername() {
-            $registry =SimpleTestOptions::_getRegistry();
-            return $registry['DefaultProxyUsername'];
-        }
+		/**
+		 *    Accessor for default proxy username.
+		 *    @return string    Proxy username for authentication.
+		 *    @access public
+		 */
+		function getDefaultProxyUsername() {
+			$registry =SimpleTestOptions::_getRegistry();
+			return $registry['DefaultProxyUsername'];
+		}
 
-        /**
-         *    Accessor for default proxy password.
-         *    @return string    Proxy password for authentication.
-         *    @access public
-         */
-        function getDefaultProxyPassword() {
-            $registry =SimpleTestOptions::_getRegistry();
-            return $registry['DefaultProxyPassword'];
-        }
+		/**
+		 *    Accessor for default proxy password.
+		 *    @return string    Proxy password for authentication.
+		 *    @access public
+		 */
+		function getDefaultProxyPassword() {
+			$registry =SimpleTestOptions::_getRegistry();
+			return $registry['DefaultProxyPassword'];
+		}
 
-        /**
-         *    Accessor for global registry of options.
-         *    @return hash           All stored values.
-         *    @access private
-         *    @static
-         */
-        static function _getRegistry() {
-            static $registry = false;
-            if (! $registry) {
-                $registry = SimpleTestOptions::_getDefaults();
-            }
-            return $registry;
-        }
+		/**
+		 *    Accessor for global registry of options.
+		 *    @return hash           All stored values.
+		 *    @access private
+		 *    @static
+		 */
+		static function _getRegistry() {
+			static $registry = false;
+			if (! $registry) {
+				$registry = SimpleTestOptions::_getDefaults();
+			}
+			return $registry;
+		}
 
-        /**
-         *    Constant default values.
-         *    @return hash       All registry defaults.
-         *    @access private
-         *    @static
-         */
-        static function _getDefaults() {
-            return array(
-                    'StubBaseClass' => 'SimpleStub',
-                    'MockBaseClass' => 'SimpleMock',
-                    'IgnoreList' => array(),
-                    'AdditionalPartialMockCode' => '',
-                    'DefaultProxy' => false,
-                    'DefaultProxyUsername' => false,
-                    'DefaultProxyPassword' => false);
-        }
-    }
+		/**
+		 *    Constant default values.
+		 *    @return hash       All registry defaults.
+		 *    @access private
+		 *    @static
+		 */
+		static function _getDefaults() {
+			return array(
+					'StubBaseClass' => 'SimpleStub',
+					'MockBaseClass' => 'SimpleMock',
+					'IgnoreList' => array(),
+					'AdditionalPartialMockCode' => '',
+					'DefaultProxy' => false,
+					'DefaultProxyUsername' => false,
+					'DefaultProxyPassword' => false);
+		}
+	}
 
-    /**
-     *  Static methods for compatibility between different
-     *  PHP versions.
-     *  @package	SimpleTest
-     */
-    class SimpleTestCompatibility {
+	/**
+	 *  Static methods for compatibility between different
+	 *  PHP versions.
+	 *  @package	SimpleTest
+	 */
+	class SimpleTestCompatibility {
 
-        /**
-         *    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.
-         *    @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.
+		 *    @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.
-         *    @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.
+		 *    @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.
-         *    @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.
+		 *    @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.
-         *    @access public
-         *    @static
-         */
-        static function isReference($first, $second) {
-            if (version_compare(phpversion(), '5', '>=')
-	    	    && is_object($first)) {
-	    	    return ($first === $second);
-	        }
-	        $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.
+		 *    @access public
+		 *    @static
+		 */
+		static function isReference($first, $second) {
+			if (version_compare(phpversion(), '5', '>=')
+				&& is_object($first)) {
+				return ($first === $second);
+			}
+			$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.
-         *    @access public
-         *    @static
-         */
-        static function isA($object, $class) {
-            if (version_compare(phpversion(), '5') >= 0) {
-                if (! class_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.
+		 *    @access public
+		 *    @static
+		 */
+		static function isA($object, $class) {
+			if (version_compare(phpversion(), '5') >= 0) {
+				if (! class_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)));
+		}
 
-        /**
-         *    Autoload safe version of class_exists().
-         *    @param string $class        Name of class to look for.
-         *    @return boolean             True if class is defined.
-         *    @access public
-         *    @static
-         */
-        static function classExists($class) {
-            if (version_compare(phpversion(), '5') >= 0) {
-                return class_exists($class, false);
-            } else {
-                return class_exists($class);
-            }
-        }
+		/**
+		 *    Autoload safe version of class_exists().
+		 *    @param string $class        Name of class to look for.
+		 *    @return boolean             True if class is defined.
+		 *    @access public
+		 *    @static
+		 */
+		static function classExists($class) {
+			if (version_compare(phpversion(), '5') >= 0) {
+				return class_exists($class, false);
+			} else {
+				return class_exists($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 +15 added lines, -15 removed lines

@@ -31,7 +31,7 @@ 
          *    @access public
          */
         static function ignore($class) {
-            $registry =SimpleTestOptions::_getRegistry();
+            $registry = SimpleTestOptions::_getRegistry();
             $registry['IgnoreList'][] = strtolower($class);
         }
 
@@ -44,7 +44,7 @@ 
          *    @static
          */
         static function isIgnored($class) {
-            $registry =SimpleTestOptions::_getRegistry();
+            $registry = SimpleTestOptions::_getRegistry();
             return in_array(strtolower($class), $registry['IgnoreList']);
         }
 
@@ -59,7 +59,7 @@ 
          *    @access public
          */
         static function setStubBaseClass($stub_base) {
-            $registry =SimpleTestOptions::_getRegistry();
+            $registry = SimpleTestOptions::_getRegistry();
             $registry['StubBaseClass'] = $stub_base;
         }
 
@@ -70,7 +70,7 @@ 
          *    @access public
          */
         static function getStubBaseClass() {
-            $registry =SimpleTestOptions::_getRegistry();
+            $registry = SimpleTestOptions::_getRegistry();
             return $registry['StubBaseClass'];
         }
 
@@ -85,7 +85,7 @@ 
          *    @access public
          */
         static function setMockBaseClass($mock_base) {
-            $registry =SimpleTestOptions::_getRegistry();
+            $registry = SimpleTestOptions::_getRegistry();
             $registry['MockBaseClass'] = $mock_base;
         }
 
@@ -96,7 +96,7 @@ 
          *    @access public
          */
         static function getMockBaseClass() {
-            $registry =SimpleTestOptions::_getRegistry();
+            $registry = SimpleTestOptions::_getRegistry();
             return $registry['MockBaseClass'];
         }
 
@@ -110,7 +110,7 @@ 
          *    @access public
          */
         static function addPartialMockCode($code = '') {
-            $registry =SimpleTestOptions::_getRegistry();
+            $registry = SimpleTestOptions::_getRegistry();
             $registry['AdditionalPartialMockCode'] = $code;
         }
 
@@ -120,7 +120,7 @@ 
          *    @access public
          */
         function getPartialMockCode() {
-            $registry =SimpleTestOptions::_getRegistry();
+            $registry = SimpleTestOptions::_getRegistry();
             return $registry['AdditionalPartialMockCode'];
         }
 
@@ -135,7 +135,7 @@ 
          *    @access public
          */
         static function useProxy($proxy, $username = false, $password = false) {
-            $registry =SimpleTestOptions::_getRegistry();
+            $registry = SimpleTestOptions::_getRegistry();
             $registry['DefaultProxy'] = $proxy;
             $registry['DefaultProxyUsername'] = $username;
             $registry['DefaultProxyPassword'] = $password;
@@ -147,7 +147,7 @@ 
          *    @access public
          */
         function getDefaultProxy() {
-            $registry =SimpleTestOptions::_getRegistry();
+            $registry = SimpleTestOptions::_getRegistry();
             return $registry['DefaultProxy'];
         }
 
@@ -157,7 +157,7 @@ 
          *    @access public
          */
         function getDefaultProxyUsername() {
-            $registry =SimpleTestOptions::_getRegistry();
+            $registry = SimpleTestOptions::_getRegistry();
             return $registry['DefaultProxyUsername'];
         }
 
@@ -167,7 +167,7 @@ 
          *    @access public
          */
         function getDefaultProxyPassword() {
-            $registry =SimpleTestOptions::_getRegistry();
+            $registry = SimpleTestOptions::_getRegistry();
             return $registry['DefaultProxyPassword'];
         }
 
@@ -179,7 +179,7 @@ 
          */
         static function _getRegistry() {
             static $registry = false;
-            if (! $registry) {
+            if (!$registry) {
                 $registry = SimpleTestOptions::_getDefaults();
             }
             return $registry;
@@ -269,7 +269,7 @@ 
                 $is_identical = SimpleTestCompatibility::_isIdenticalType(
                         $first[$key],
                         $second[$key]);
-                if (! $is_identical) {
+                if (!$is_identical) {
                     return false;
                 }
             }
@@ -305,7 +305,7 @@ 
          */
         static function isA($object, $class) {
             if (version_compare(phpversion(), '5') >= 0) {
-                if (! class_exists($class, false)) {
+                if (!class_exists($class, false)) {
                     return false;
                 }
                 eval("\$is_a = \$object instanceof $class;");

tests/test_tools/simpletest/page.php

Doc Comments +6 added lines, -6 removed lines

@@ -143,7 +143,7 @@ 
         /**
          *    Reads the raw content and send events
          *    into the page to be built.
-         *    @param $response SimpleHttpResponse  Fetched response.
+         *    @param SimpleHttpResponse $response SimpleHttpResponse  Fetched response.
          *    @return SimplePage                   Newly parsed page.
          *    @access public
          */
@@ -168,8 +168,8 @@ 
 
         /**
          *    Creates the parser used with the builder.
-         *    @param $listener SimpleSaxListener   Target of parser.
-         *    @return SimpleSaxParser              Parser to generate
+         *    @param SimplePageBuilder $listener SimpleSaxListener   Target of parser.
+         *    @return SimpleHtmlSaxParser              Parser to generate
          *                                         events for the builder.
          *    @access protected
          */
@@ -403,7 +403,7 @@ 
 
         /**
          *    Original request as bytes sent down the wire.
-         *    @return mixed              Sent content.
+         *    @return string|false              Sent content.
          *    @access public
          */
         function getRequest() {
@@ -412,7 +412,7 @@ 
 
         /**
          *    Accessor for raw text of page.
-         *    @return string        Raw unparsed content.
+         *    @return boolean        Raw unparsed content.
          *    @access public
          */
         function getRaw() {
@@ -644,7 +644,7 @@ 
         /**
          *    Opens a frameset. A frameset may contain nested
          *    frameset tags.
-         *    @param SimpleFramesetTag $tag      Tag to accept.
+         *    @param SimpleTag $tag      Tag to accept.
          *    @access public
          */
         function acceptFramesetStart($tag) {

Indentation +965 added lines, -965 removed lines

@@ -1,974 +1,974 @@
 <?php
-    /**
-     *	Base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	WebTester
-     *	@version	$Id: page.php 1398 2006-09-08 19:31:03Z xue $
-     */
-
-    /**#@+
+	/**
+	 *	Base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	WebTester
+	 *	@version	$Id: page.php 1398 2006-09-08 19:31:03Z xue $
+	 */
+
+	/**#@+
      *	include other SimpleTest class files
      */
-    require_once(dirname(__FILE__) . '/http.php');
-    require_once(dirname(__FILE__) . '/parser.php');
-    require_once(dirname(__FILE__) . '/tag.php');
-    require_once(dirname(__FILE__) . '/form.php');
-    require_once(dirname(__FILE__) . '/selector.php');
-    /**#@-*/
-
-    /**
-     *    Creates tags and widgets given HTML tag
-     *    attributes.
+	require_once(dirname(__FILE__) . '/http.php');
+	require_once(dirname(__FILE__) . '/parser.php');
+	require_once(dirname(__FILE__) . '/tag.php');
+	require_once(dirname(__FILE__) . '/form.php');
+	require_once(dirname(__FILE__) . '/selector.php');
+	/**#@-*/
+
+	/**
+	 *    Creates tags and widgets given HTML tag
+	 *    attributes.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleTagBuilder {
-
-        /**
-         *    Factory for the tag objects. Creates the
-         *    appropriate tag object for the incoming tag name
-         *    and attributes.
-         *    @param string $name        HTML tag name.
-         *    @param hash $attributes    Element attributes.
-         *    @return SimpleTag          Tag object.
-         *    @access public
-         */
-        function createTag($name, $attributes) {
-            static $map = array(
-                    'a' => 'SimpleAnchorTag',
-                    'title' => 'SimpleTitleTag',
-                    'button' => 'SimpleButtonTag',
-                    'textarea' => 'SimpleTextAreaTag',
-                    'option' => 'SimpleOptionTag',
-                    'label' => 'SimpleLabelTag',
-                    'form' => 'SimpleFormTag',
-                    'frame' => 'SimpleFrameTag');
-            $attributes = $this->_keysToLowerCase($attributes);
-            if (array_key_exists($name, $map)) {
-                $tag_class = $map[$name];
-                return new $tag_class($attributes);
-            } elseif ($name == 'select') {
-                return $this->_createSelectionTag($attributes);
-            } elseif ($name == 'input') {
-                return $this->_createInputTag($attributes);
-            }
-            return new SimpleTag($name, $attributes);
-        }
-
-        /**
-         *    Factory for selection fields.
-         *    @param hash $attributes    Element attributes.
-         *    @return SimpleTag          Tag object.
-         *    @access protected
-         */
-        function _createSelectionTag($attributes) {
-            if (isset($attributes['multiple'])) {
-                return new MultipleSelectionTag($attributes);
-            }
-            return new SimpleSelectionTag($attributes);
-        }
-
-        /**
-         *    Factory for input tags.
-         *    @param hash $attributes    Element attributes.
-         *    @return SimpleTag          Tag object.
-         *    @access protected
-         */
-        function _createInputTag($attributes) {
-            if (! isset($attributes['type'])) {
-                return new SimpleTextTag($attributes);
-            }
-            $type = strtolower(trim($attributes['type']));
-            $map = array(
-                    'submit' => 'SimpleSubmitTag',
-                    'image' => 'SimpleImageSubmitTag',
-                    'checkbox' => 'SimpleCheckboxTag',
-                    'radio' => 'SimpleRadioButtonTag',
-                    'text' => 'SimpleTextTag',
-                    'hidden' => 'SimpleTextTag',
-                    'password' => 'SimpleTextTag',
-                    'file' => 'SimpleUploadTag');
-            if (array_key_exists($type, $map)) {
-                $tag_class = $map[$type];
-                return new $tag_class($attributes);
-            }
-            return false;
-        }
-
-        /**
-         *    Make the keys lower case for case insensitive look-ups.
-         *    @param hash $map   Hash to convert.
-         *    @return hash       Unchanged values, but keys lower case.
-         *    @access private
-         */
-        function _keysToLowerCase($map) {
-            $lower = array();
-            foreach ($map as $key => $value) {
-                $lower[strtolower($key)] = $value;
-            }
-            return $lower;
-        }
-    }
-
-    /**
-     *    SAX event handler. Maintains a list of
-     *    open tags and dispatches them as they close.
+	 */
+	class SimpleTagBuilder {
+
+		/**
+		 *    Factory for the tag objects. Creates the
+		 *    appropriate tag object for the incoming tag name
+		 *    and attributes.
+		 *    @param string $name        HTML tag name.
+		 *    @param hash $attributes    Element attributes.
+		 *    @return SimpleTag          Tag object.
+		 *    @access public
+		 */
+		function createTag($name, $attributes) {
+			static $map = array(
+					'a' => 'SimpleAnchorTag',
+					'title' => 'SimpleTitleTag',
+					'button' => 'SimpleButtonTag',
+					'textarea' => 'SimpleTextAreaTag',
+					'option' => 'SimpleOptionTag',
+					'label' => 'SimpleLabelTag',
+					'form' => 'SimpleFormTag',
+					'frame' => 'SimpleFrameTag');
+			$attributes = $this->_keysToLowerCase($attributes);
+			if (array_key_exists($name, $map)) {
+				$tag_class = $map[$name];
+				return new $tag_class($attributes);
+			} elseif ($name == 'select') {
+				return $this->_createSelectionTag($attributes);
+			} elseif ($name == 'input') {
+				return $this->_createInputTag($attributes);
+			}
+			return new SimpleTag($name, $attributes);
+		}
+
+		/**
+		 *    Factory for selection fields.
+		 *    @param hash $attributes    Element attributes.
+		 *    @return SimpleTag          Tag object.
+		 *    @access protected
+		 */
+		function _createSelectionTag($attributes) {
+			if (isset($attributes['multiple'])) {
+				return new MultipleSelectionTag($attributes);
+			}
+			return new SimpleSelectionTag($attributes);
+		}
+
+		/**
+		 *    Factory for input tags.
+		 *    @param hash $attributes    Element attributes.
+		 *    @return SimpleTag          Tag object.
+		 *    @access protected
+		 */
+		function _createInputTag($attributes) {
+			if (! isset($attributes['type'])) {
+				return new SimpleTextTag($attributes);
+			}
+			$type = strtolower(trim($attributes['type']));
+			$map = array(
+					'submit' => 'SimpleSubmitTag',
+					'image' => 'SimpleImageSubmitTag',
+					'checkbox' => 'SimpleCheckboxTag',
+					'radio' => 'SimpleRadioButtonTag',
+					'text' => 'SimpleTextTag',
+					'hidden' => 'SimpleTextTag',
+					'password' => 'SimpleTextTag',
+					'file' => 'SimpleUploadTag');
+			if (array_key_exists($type, $map)) {
+				$tag_class = $map[$type];
+				return new $tag_class($attributes);
+			}
+			return false;
+		}
+
+		/**
+		 *    Make the keys lower case for case insensitive look-ups.
+		 *    @param hash $map   Hash to convert.
+		 *    @return hash       Unchanged values, but keys lower case.
+		 *    @access private
+		 */
+		function _keysToLowerCase($map) {
+			$lower = array();
+			foreach ($map as $key => $value) {
+				$lower[strtolower($key)] = $value;
+			}
+			return $lower;
+		}
+	}
+
+	/**
+	 *    SAX event handler. Maintains a list of
+	 *    open tags and dispatches them as they close.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimplePageBuilder extends SimpleSaxListener {
-        protected $_tags;
-        protected $_page;
-        protected $_private_content_tag;
-
-        /**
-         *    Sets the builder up empty.
-         *    @access public
-         */
-        function SimplePageBuilder() {
-            $this->SimpleSaxListener();
-        }
-
-        /**
-         *    Frees up any references so as to allow the PHP garbage
-         *    collection from unset() to work.
-         *    @access public
-         */
-        function free() {
-            unset($this->_tags);
-            unset($this->_page);
-            unset($this->_private_content_tags);
-        }
-
-        /**
-         *    Reads the raw content and send events
-         *    into the page to be built.
-         *    @param $response SimpleHttpResponse  Fetched response.
-         *    @return SimplePage                   Newly parsed page.
-         *    @access public
-         */
-        function &parse($response) {
-            $this->_tags = array();
-            $this->_page = $this->_createPage($response);
-            $parser = $this->_createParser($this);
-            $parser->parse($response->getContent());
-            $this->_page->acceptPageEnd();
-            return $this->_page;
-        }
-
-        /**
-         *    Creates an empty page.
-         *    @return SimplePage        New unparsed page.
-         *    @access protected
-         */
-        function &_createPage($response) {
-            $page = new SimplePage($response);
-            return $page;
-        }
-
-        /**
-         *    Creates the parser used with the builder.
-         *    @param $listener SimpleSaxListener   Target of parser.
-         *    @return SimpleSaxParser              Parser to generate
-         *                                         events for the builder.
-         *    @access protected
-         */
-        function &_createParser($listener) {
-            $parser = new SimpleHtmlSaxParser($listener);
-            return $parser;
-        }
-
-        /**
-         *    Start of element event. Opens a new tag.
-         *    @param string $name         Element name.
-         *    @param hash $attributes     Attributes without content
-         *                                are marked as true.
-         *    @return boolean             False on parse error.
-         *    @access public
-         */
-        function startElement($name, $attributes) {
-            $factory = new SimpleTagBuilder();
-            $tag = $factory->createTag($name, $attributes);
-            if (! $tag) {
-                return true;
-            }
-            if ($tag->getTagName() == 'label') {
-                $this->_page->acceptLabelStart($tag);
-                $this->_openTag($tag);
-                return true;
-            }
-            if ($tag->getTagName() == 'form') {
-                $this->_page->acceptFormStart($tag);
-                return true;
-            }
-            if ($tag->getTagName() == 'frameset') {
-                $this->_page->acceptFramesetStart($tag);
-                return true;
-            }
-            if ($tag->getTagName() == 'frame') {
-                $this->_page->acceptFrame($tag);
-                return true;
-            }
-            if ($tag->isPrivateContent() && ! isset($this->_private_content_tag)) {
-                $this->_private_content_tag = $tag;
-            }
-            if ($tag->expectEndTag()) {
-                $this->_openTag($tag);
-                return true;
-            }
-            $this->_page->acceptTag($tag);
-            return true;
-        }
-
-        /**
-         *    End of element event.
-         *    @param string $name        Element name.
-         *    @return boolean            False on parse error.
-         *    @access public
-         */
-        function endElement($name) {
-            if ($name == 'label') {
-                $this->_page->acceptLabelEnd();
-                return true;
-            }
-            if ($name == 'form') {
-                $this->_page->acceptFormEnd();
-                return true;
-            }
-            if ($name == 'frameset') {
-                $this->_page->acceptFramesetEnd();
-                return true;
-            }
-            if ($this->_hasNamedTagOnOpenTagStack($name)) {
-                $tag = array_pop($this->_tags[$name]);
-                if ($tag->isPrivateContent() && $this->_private_content_tag->getTagName() == $name) {
-                    unset($this->_private_content_tag);
-                }
-                $this->_addContentTagToOpenTags($tag);
-                $this->_page->acceptTag($tag);
-                return true;
-            }
-            return true;
-        }
-
-        /**
-         *    Test to see if there are any open tags awaiting
-         *    closure that match the tag name.
-         *    @param string $name        Element name.
-         *    @return boolean            True if any are still open.
-         *    @access private
-         */
-        function _hasNamedTagOnOpenTagStack($name) {
-            return isset($this->_tags[$name]) && (count($this->_tags[$name]) > 0);
-        }
-
-        /**
-         *    Unparsed, but relevant data. The data is added
-         *    to every open tag.
-         *    @param string $text        May include unparsed tags.
-         *    @return boolean            False on parse error.
-         *    @access public
-         */
-        function addContent($text) {
-            if (isset($this->_private_content_tag)) {
-                $this->_private_content_tag->addContent($text);
-            } else {
-                $this->_addContentToAllOpenTags($text);
-            }
-            return true;
-        }
-
-        /**
-         *    Any content fills all currently open tags unless it
-         *    is part of an option tag.
-         *    @param string $text        May include unparsed tags.
-         *    @access private
-         */
-        function _addContentToAllOpenTags($text) {
-            foreach (array_keys($this->_tags) as $name) {
-                for ($i = 0, $count = count($this->_tags[$name]); $i < $count; $i++) {
-                    $this->_tags[$name][$i]->addContent($text);
-                }
-            }
-        }
-
-        /**
-         *    Parsed data in tag form. The parsed tag is added
-         *    to every open tag. Used for adding options to select
-         *    fields only.
-         *    @param SimpleTag $tag        Option tags only.
-         *    @access private
-         */
-        function _addContentTagToOpenTags($tag) {
-            if ($tag->getTagName() != 'option') {
-                return;
-            }
-            foreach (array_keys($this->_tags) as $name) {
-                for ($i = 0, $count = count($this->_tags[$name]); $i < $count; $i++) {
-                    $this->_tags[$name][$i]->addTag($tag);
-                }
-            }
-        }
-
-        /**
-         *    Opens a tag for receiving content. Multiple tags
-         *    will be receiving input at the same time.
-         *    @param SimpleTag $tag        New content tag.
-         *    @access private
-         */
-        function _openTag($tag) {
-            $name = $tag->getTagName();
-            if (! in_array($name, array_keys($this->_tags))) {
-                $this->_tags[$name] = array();
-            }
-            $this->_tags[$name][] = $tag;
-        }
-    }
-
-    /**
-     *    A wrapper for a web page.
+	 */
+	class SimplePageBuilder extends SimpleSaxListener {
+		protected $_tags;
+		protected $_page;
+		protected $_private_content_tag;
+
+		/**
+		 *    Sets the builder up empty.
+		 *    @access public
+		 */
+		function SimplePageBuilder() {
+			$this->SimpleSaxListener();
+		}
+
+		/**
+		 *    Frees up any references so as to allow the PHP garbage
+		 *    collection from unset() to work.
+		 *    @access public
+		 */
+		function free() {
+			unset($this->_tags);
+			unset($this->_page);
+			unset($this->_private_content_tags);
+		}
+
+		/**
+		 *    Reads the raw content and send events
+		 *    into the page to be built.
+		 *    @param $response SimpleHttpResponse  Fetched response.
+		 *    @return SimplePage                   Newly parsed page.
+		 *    @access public
+		 */
+		function &parse($response) {
+			$this->_tags = array();
+			$this->_page = $this->_createPage($response);
+			$parser = $this->_createParser($this);
+			$parser->parse($response->getContent());
+			$this->_page->acceptPageEnd();
+			return $this->_page;
+		}
+
+		/**
+		 *    Creates an empty page.
+		 *    @return SimplePage        New unparsed page.
+		 *    @access protected
+		 */
+		function &_createPage($response) {
+			$page = new SimplePage($response);
+			return $page;
+		}
+
+		/**
+		 *    Creates the parser used with the builder.
+		 *    @param $listener SimpleSaxListener   Target of parser.
+		 *    @return SimpleSaxParser              Parser to generate
+		 *                                         events for the builder.
+		 *    @access protected
+		 */
+		function &_createParser($listener) {
+			$parser = new SimpleHtmlSaxParser($listener);
+			return $parser;
+		}
+
+		/**
+		 *    Start of element event. Opens a new tag.
+		 *    @param string $name         Element name.
+		 *    @param hash $attributes     Attributes without content
+		 *                                are marked as true.
+		 *    @return boolean             False on parse error.
+		 *    @access public
+		 */
+		function startElement($name, $attributes) {
+			$factory = new SimpleTagBuilder();
+			$tag = $factory->createTag($name, $attributes);
+			if (! $tag) {
+				return true;
+			}
+			if ($tag->getTagName() == 'label') {
+				$this->_page->acceptLabelStart($tag);
+				$this->_openTag($tag);
+				return true;
+			}
+			if ($tag->getTagName() == 'form') {
+				$this->_page->acceptFormStart($tag);
+				return true;
+			}
+			if ($tag->getTagName() == 'frameset') {
+				$this->_page->acceptFramesetStart($tag);
+				return true;
+			}
+			if ($tag->getTagName() == 'frame') {
+				$this->_page->acceptFrame($tag);
+				return true;
+			}
+			if ($tag->isPrivateContent() && ! isset($this->_private_content_tag)) {
+				$this->_private_content_tag = $tag;
+			}
+			if ($tag->expectEndTag()) {
+				$this->_openTag($tag);
+				return true;
+			}
+			$this->_page->acceptTag($tag);
+			return true;
+		}
+
+		/**
+		 *    End of element event.
+		 *    @param string $name        Element name.
+		 *    @return boolean            False on parse error.
+		 *    @access public
+		 */
+		function endElement($name) {
+			if ($name == 'label') {
+				$this->_page->acceptLabelEnd();
+				return true;
+			}
+			if ($name == 'form') {
+				$this->_page->acceptFormEnd();
+				return true;
+			}
+			if ($name == 'frameset') {
+				$this->_page->acceptFramesetEnd();
+				return true;
+			}
+			if ($this->_hasNamedTagOnOpenTagStack($name)) {
+				$tag = array_pop($this->_tags[$name]);
+				if ($tag->isPrivateContent() && $this->_private_content_tag->getTagName() == $name) {
+					unset($this->_private_content_tag);
+				}
+				$this->_addContentTagToOpenTags($tag);
+				$this->_page->acceptTag($tag);
+				return true;
+			}
+			return true;
+		}
+
+		/**
+		 *    Test to see if there are any open tags awaiting
+		 *    closure that match the tag name.
+		 *    @param string $name        Element name.
+		 *    @return boolean            True if any are still open.
+		 *    @access private
+		 */
+		function _hasNamedTagOnOpenTagStack($name) {
+			return isset($this->_tags[$name]) && (count($this->_tags[$name]) > 0);
+		}
+
+		/**
+		 *    Unparsed, but relevant data. The data is added
+		 *    to every open tag.
+		 *    @param string $text        May include unparsed tags.
+		 *    @return boolean            False on parse error.
+		 *    @access public
+		 */
+		function addContent($text) {
+			if (isset($this->_private_content_tag)) {
+				$this->_private_content_tag->addContent($text);
+			} else {
+				$this->_addContentToAllOpenTags($text);
+			}
+			return true;
+		}
+
+		/**
+		 *    Any content fills all currently open tags unless it
+		 *    is part of an option tag.
+		 *    @param string $text        May include unparsed tags.
+		 *    @access private
+		 */
+		function _addContentToAllOpenTags($text) {
+			foreach (array_keys($this->_tags) as $name) {
+				for ($i = 0, $count = count($this->_tags[$name]); $i < $count; $i++) {
+					$this->_tags[$name][$i]->addContent($text);
+				}
+			}
+		}
+
+		/**
+		 *    Parsed data in tag form. The parsed tag is added
+		 *    to every open tag. Used for adding options to select
+		 *    fields only.
+		 *    @param SimpleTag $tag        Option tags only.
+		 *    @access private
+		 */
+		function _addContentTagToOpenTags($tag) {
+			if ($tag->getTagName() != 'option') {
+				return;
+			}
+			foreach (array_keys($this->_tags) as $name) {
+				for ($i = 0, $count = count($this->_tags[$name]); $i < $count; $i++) {
+					$this->_tags[$name][$i]->addTag($tag);
+				}
+			}
+		}
+
+		/**
+		 *    Opens a tag for receiving content. Multiple tags
+		 *    will be receiving input at the same time.
+		 *    @param SimpleTag $tag        New content tag.
+		 *    @access private
+		 */
+		function _openTag($tag) {
+			$name = $tag->getTagName();
+			if (! in_array($name, array_keys($this->_tags))) {
+				$this->_tags[$name] = array();
+			}
+			$this->_tags[$name][] = $tag;
+		}
+	}
+
+	/**
+	 *    A wrapper for a web page.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimplePage {
-        protected $_links;
-        protected $_title;
-        protected $_last_widget;
-        protected $_label;
-        protected $_left_over_labels;
-        protected $_open_forms;
-        protected $_complete_forms;
-        protected $_frameset;
-        protected $_frames;
-        protected $_frameset_nesting_level;
-        protected $_transport_error;
-        protected $_raw;
-        protected $_text;
-        protected $_sent;
-        protected $_headers;
-        protected $_method;
-        protected $_url;
-        protected $_request_data;
-
-        /**
-         *    Parses a page ready to access it's contents.
-         *    @param SimpleHttpResponse $response     Result of HTTP fetch.
-         *    @access public
-         */
-        function SimplePage($response = false) {
-            $this->_links = array();
-            $this->_title = false;
-            $this->_left_over_labels = array();
-            $this->_open_forms = array();
-            $this->_complete_forms = array();
-            $this->_frameset = false;
-            $this->_frames = array();
-            $this->_frameset_nesting_level = 0;
-            $this->_text = false;
-            if ($response) {
-                $this->_extractResponse($response);
-            } else {
-                $this->_noResponse();
-            }
-        }
-
-        /**
-         *    Extracts all of the response information.
-         *    @param SimpleHttpResponse $response    Response being parsed.
-         *    @access private
-         */
-        function _extractResponse($response) {
-            $this->_transport_error = $response->getError();
-            $this->_raw = $response->getContent();
-            $this->_sent = $response->getSent();
-            $this->_headers = $response->getHeaders();
-            $this->_method = $response->getMethod();
-            $this->_url = $response->getUrl();
-            $this->_request_data = $response->getRequestData();
-        }
-
-        /**
-         *    Sets up a missing response.
-         *    @access private
-         */
-        function _noResponse() {
-            $this->_transport_error = 'No page fetched yet';
-            $this->_raw = false;
-            $this->_sent = false;
-            $this->_headers = false;
-            $this->_method = 'GET';
-            $this->_url = false;
-            $this->_request_data = false;
-        }
-
-        /**
-         *    Original request as bytes sent down the wire.
-         *    @return mixed              Sent content.
-         *    @access public
-         */
-        function getRequest() {
-            return $this->_sent;
-        }
-
-        /**
-         *    Accessor for raw text of page.
-         *    @return string        Raw unparsed content.
-         *    @access public
-         */
-        function getRaw() {
-            return $this->_raw;
-        }
-
-        /**
-         *    Accessor for plain text of page as a text browser
-         *    would see it.
-         *    @return string        Plain text of page.
-         *    @access public
-         */
-        function getText() {
-            if (! $this->_text) {
-                $this->_text = SimpleHtmlSaxParser::normalise($this->_raw);
-            }
-            return $this->_text;
-        }
-
-        /**
-         *    Accessor for raw headers of page.
-         *    @return string       Header block as text.
-         *    @access public
-         */
-        function getHeaders() {
-            if ($this->_headers) {
-                return $this->_headers->getRaw();
-            }
-            return false;
-        }
-
-        /**
-         *    Original request method.
-         *    @return string        GET, POST or HEAD.
-         *    @access public
-         */
-        function getMethod() {
-            return $this->_method;
-        }
-
-        /**
-         *    Original 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->_request_data;
-        }
-
-        /**
-         *    Accessor for last error.
-         *    @return string        Error from last response.
-         *    @access public
-         */
-        function getTransportError() {
-            return $this->_transport_error;
-        }
-
-        /**
-         *    Accessor for current MIME type.
-         *    @return string    MIME type as string; e.g. 'text/html'
-         *    @access public
-         */
-        function getMimeType() {
-            if ($this->_headers) {
-                return $this->_headers->getMimeType();
-            }
-            return false;
-        }
-
-        /**
-         *    Accessor for HTTP response code.
-         *    @return integer    HTTP response code received.
-         *    @access public
-         */
-        function getResponseCode() {
-            if ($this->_headers) {
-                return $this->_headers->getResponseCode();
-            }
-            return false;
-        }
-
-        /**
-         *    Accessor for last Authentication type. Only valid
-         *    straight after a challenge (401).
-         *    @return string    Description of challenge type.
-         *    @access public
-         */
-        function getAuthentication() {
-            if ($this->_headers) {
-                return $this->_headers->getAuthentication();
-            }
-            return false;
-        }
-
-        /**
-         *    Accessor for last Authentication realm. Only valid
-         *    straight after a challenge (401).
-         *    @return string    Name of security realm.
-         *    @access public
-         */
-        function getRealm() {
-            if ($this->_headers) {
-                return $this->_headers->getRealm();
-            }
-            return false;
-        }
-
-        /**
-         *    Accessor for current frame focus. Will be
-         *    false as no frames.
-         *    @return array    Always empty.
-         *    @access public
-         */
-        function getFrameFocus() {
-            return array();
-        }
-
-        /**
-         *    Sets the focus by index. The integer index starts from 1.
-         *    @param integer $choice    Chosen frame.
-         *    @return boolean           Always false.
-         *    @access public
-         */
-        function setFrameFocusByIndex($choice) {
-            return false;
-        }
-
-        /**
-         *    Sets the focus by name. Always fails for a leaf page.
-         *    @param string $name    Chosen frame.
-         *    @return boolean        False as no frames.
-         *    @access public
-         */
-        function setFrameFocus($name) {
-            return false;
-        }
-
-        /**
-         *    Clears the frame focus. Does nothing for a leaf page.
-         *    @access public
-         */
-        function clearFrameFocus() {
-        }
-
-        /**
-         *    Adds a tag to the page.
-         *    @param SimpleTag $tag        Tag to accept.
-         *    @access public
-         */
-        function acceptTag($tag) {
-            if ($tag->getTagName() == "a") {
-                $this->_addLink($tag);
-            } elseif ($tag->getTagName() == "title") {
-                $this->_setTitle($tag);
-            } elseif ($this->_isFormElement($tag->getTagName())) {
-                for ($i = 0; $i < count($this->_open_forms); $i++) {
-                    $this->_open_forms[$i]->addWidget($tag);
-                }
-                $this->_last_widget = $tag;
-            }
-        }
-
-        /**
-         *    Opens a label for a described widget.
-         *    @param SimpleFormTag $tag      Tag to accept.
-         *    @access public
-         */
-        function acceptLabelStart($tag) {
-            $this->_label = $tag;
-            unset($this->_last_widget);
-        }
-
-        /**
-         *    Closes the most recently opened label.
-         *    @access public
-         */
-        function acceptLabelEnd() {
-            if (isset($this->_label)) {
-                if (isset($this->_last_widget)) {
-                    $this->_last_widget->setLabel($this->_label->getText());
-                    unset($this->_last_widget);
-                } else {
-                    $this->_left_over_labels[] = SimpleTestCompatibility::copy($this->_label);
-                }
-                unset($this->_label);
-            }
-        }
-
-        /**
-         *    Tests to see if a tag is a possible form
-         *    element.
-         *    @param string $name     HTML element name.
-         *    @return boolean         True if form element.
-         *    @access private
-         */
-        function _isFormElement($name) {
-            return in_array($name, array('input', 'button', 'textarea', 'select'));
-        }
-
-        /**
-         *    Opens a form. New widgets go here.
-         *    @param SimpleFormTag $tag      Tag to accept.
-         *    @access public
-         */
-        function acceptFormStart($tag) {
-            $this->_open_forms[] = new SimpleForm($tag, $this->getUrl());
-        }
-
-        /**
-         *    Closes the most recently opened form.
-         *    @access public
-         */
-        function acceptFormEnd() {
-            if (count($this->_open_forms)) {
-                $this->_complete_forms[] = array_pop($this->_open_forms);
-            }
-        }
-
-        /**
-         *    Opens a frameset. A frameset may contain nested
-         *    frameset tags.
-         *    @param SimpleFramesetTag $tag      Tag to accept.
-         *    @access public
-         */
-        function acceptFramesetStart($tag) {
-            if (! $this->_isLoadingFrames()) {
-                $this->_frameset = $tag;
-            }
-            $this->_frameset_nesting_level++;
-        }
-
-        /**
-         *    Closes the most recently opened frameset.
-         *    @access public
-         */
-        function acceptFramesetEnd() {
-            if ($this->_isLoadingFrames()) {
-                $this->_frameset_nesting_level--;
-            }
-        }
-
-        /**
-         *    Takes a single frame tag and stashes it in
-         *    the current frame set.
-         *    @param SimpleFrameTag $tag      Tag to accept.
-         *    @access public
-         */
-        function acceptFrame($tag) {
-            if ($this->_isLoadingFrames()) {
-                if ($tag->getAttribute('src')) {
-                    $this->_frames[] = $tag;
-                }
-            }
-        }
-
-        /**
-         *    Test to see if in the middle of reading
-         *    a frameset.
-         *    @return boolean        True if inframeset.
-         *    @access private
-         */
-        function _isLoadingFrames() {
-            if (! $this->_frameset) {
-                return false;
-            }
-            return ($this->_frameset_nesting_level > 0);
-        }
-
-        /**
-         *    Test to see if link is an absolute one.
-         *    @param string $url     Url to test.
-         *    @return boolean        True if absolute.
-         *    @access protected
-         */
-        function _linkIsAbsolute($url) {
-            $parsed = new SimpleUrl($url);
-            return (boolean)($parsed->getScheme() && $parsed->getHost());
-        }
-
-        /**
-         *    Adds a link to the page.
-         *    @param SimpleAnchorTag $tag      Link to accept.
-         *    @access protected
-         */
-        function _addLink($tag) {
-            $this->_links[] = $tag;
-        }
-
-        /**
-         *    Marker for end of complete page. Any work in
-         *    progress can now be closed.
-         *    @access public
-         */
-        function acceptPageEnd() {
-            while (count($this->_open_forms)) {
-                $this->_complete_forms[] = array_pop($this->_open_forms);
-            }
-            foreach ($this->_left_over_labels as $label) {
-                for ($i = 0, $count = count($this->_complete_forms); $i < $count; $i++) {
-                    $this->_complete_forms[$i]->attachLabelBySelector(
-                            new SimpleById($label->getFor()),
-                            $label->getText());
-                }
-            }
-        }
-
-        /**
-         *    Test for the presence of a frameset.
-         *    @return boolean        True if frameset.
-         *    @access public
-         */
-        function hasFrames() {
-            return (boolean)$this->_frameset;
-        }
-
-        /**
-         *    Accessor for frame name and source URL for every frame that
-         *    will need to be loaded. Immediate children only.
-         *    @return boolean/array     False if no frameset or
-         *                              otherwise a hash of frame URLs.
-         *                              The key is either a numerical
-         *                              base one index or the name attribute.
-         *    @access public
-         */
-        function getFrameset() {
-            if (! $this->_frameset) {
-                return false;
-            }
-            $urls = array();
-            for ($i = 0; $i < count($this->_frames); $i++) {
-                $name = $this->_frames[$i]->getAttribute('name');
-                $url = new SimpleUrl($this->_frames[$i]->getAttribute('src'));
-                $urls[$name ? $name : $i + 1] = $url->makeAbsolute($this->getUrl());
-            }
-            return $urls;
-        }
-
-        /**
-         *    Fetches a list of loaded frames.
-         *    @return array/string    Just the URL for a single page.
-         *    @access public
-         */
-        function getFrames() {
-            $url = $this->getUrl();
-            return $url->asString();
-        }
-
-        /**
-         *    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() {
-            $all = array();
-            foreach ($this->_links as $link) {
-                if ($this->_linkIsAbsolute($link->getHref())) {
-                    $all[] = $link->getHref();
-                }
-            }
-            return $all;
-        }
-
-        /**
-         *    Accessor for a list of all relative links.
-         *    @return array      List of urls without hostname.
-         *    @access public
-         */
-        function getRelativeUrls() {
-            $all = array();
-            foreach ($this->_links as $link) {
-                if (! $this->_linkIsAbsolute($link->getHref())) {
-                    $all[] = $link->getHref();
-                }
-            }
-            return $all;
-        }
-
-        /**
-         *    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) {
-            $matches = array();
-            foreach ($this->_links as $link) {
-                if ($link->getText() == $label) {
-                    $matches[] = $this->_getUrlFromLink($link);
-                }
-            }
-            return $matches;
-        }
-
-        /**
-         *    Accessor for a URL by the id attribute.
-         *    @param string $id       Id attribute of link.
-         *    @return SimpleUrl       URL with that id of false if none.
-         *    @access public
-         */
-        function getUrlById($id) {
-            foreach ($this->_links as $link) {
-                if ($link->getAttribute('id') === (string)$id) {
-                    return $this->_getUrlFromLink($link);
-                }
-            }
-            return false;
-        }
-
-        /**
-         *    Converts a link into a target URL.
-         *    @param SimpleAnchor $link    Parsed link.
-         *    @return SimpleUrl            URL with frame target if any.
-         *    @access private
-         */
-        function _getUrlFromLink($link) {
-            $url = $this->_makeAbsolute($link->getHref());
-            if ($link->getAttribute('target')) {
-                $url->setTarget($link->getAttribute('target'));
-            }
-            return $url;
-        }
-
-        /**
-         *    Expands expandomatic URLs into fully qualified
-         *    URLs.
-         *    @param SimpleUrl $url        Relative URL.
-         *    @return SimpleUrl            Absolute URL.
-         *    @access protected
-         */
-        function _makeAbsolute($url) {
-            if (! is_object($url)) {
-                $url = new SimpleUrl($url);
-            }
-            return $url->makeAbsolute($this->getUrl());
-        }
-
-        /**
-         *    Sets the title tag contents.
-         *    @param SimpleTitleTag $tag    Title of page.
-         *    @access protected
-         */
-        function _setTitle($tag) {
-            $this->_title = $tag;
-        }
-
-        /**
-         *    Accessor for parsed title.
-         *    @return string     Title or false if no title is present.
-         *    @access public
-         */
-        function getTitle() {
-            if ($this->_title) {
-                return $this->_title->getText();
-            }
-            return false;
-        }
-
-        /**
-         *    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) {
-            for ($i = 0; $i < count($this->_complete_forms); $i++) {
-                if ($this->_complete_forms[$i]->hasSubmit($selector)) {
-                    return $this->_complete_forms[$i];
-                }
-            }
-            $null = null;
-            return $null;
-        }
-
-        /**
-         *    Finds a held form by image using a selector.
-         *    Will only search correctly built forms.
-         *    @param SimpleSelector $selector  Image finder.
-         *    @return SimpleForm               Form object containing
-         *                                     the image.
-         *    @access public
-         */
-        function &getFormByImage($selector) {
-            for ($i = 0; $i < count($this->_complete_forms); $i++) {
-                if ($this->_complete_forms[$i]->hasImage($selector)) {
-                    return $this->_complete_forms[$i];
-                }
-            }
-            $null = null;
-            return $null;
-        }
-
-        /**
-         *    Finds a held form by the form ID. A way of
-         *    identifying a specific form when we have control
-         *    of the HTML code.
-         *    @param string $id     Form label.
-         *    @return SimpleForm    Form object containing the matching ID.
-         *    @access public
-         */
-        function &getFormById($id) {
-            for ($i = 0; $i < count($this->_complete_forms); $i++) {
-                if ($this->_complete_forms[$i]->getId() == $id) {
-                    return $this->_complete_forms[$i];
-                }
-            }
-            $null = null;
-            return $null;
-        }
-
-        /**
-         *    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) {
-            $is_set = false;
-            for ($i = 0; $i < count($this->_complete_forms); $i++) {
-                if ($this->_complete_forms[$i]->setField($selector, $value)) {
-                    $is_set = true;
-                }
-            }
-            return $is_set;
-        }
-
-        /**
-         *    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->_complete_forms); $i++) {
-                $value = $this->_complete_forms[$i]->getValue($selector);
-                if (isset($value)) {
-                    return $value;
-                }
-            }
-            return null;
-        }
-    }
+	 */
+	class SimplePage {
+		protected $_links;
+		protected $_title;
+		protected $_last_widget;
+		protected $_label;
+		protected $_left_over_labels;
+		protected $_open_forms;
+		protected $_complete_forms;
+		protected $_frameset;
+		protected $_frames;
+		protected $_frameset_nesting_level;
+		protected $_transport_error;
+		protected $_raw;
+		protected $_text;
+		protected $_sent;
+		protected $_headers;
+		protected $_method;
+		protected $_url;
+		protected $_request_data;
+
+		/**
+		 *    Parses a page ready to access it's contents.
+		 *    @param SimpleHttpResponse $response     Result of HTTP fetch.
+		 *    @access public
+		 */
+		function SimplePage($response = false) {
+			$this->_links = array();
+			$this->_title = false;
+			$this->_left_over_labels = array();
+			$this->_open_forms = array();
+			$this->_complete_forms = array();
+			$this->_frameset = false;
+			$this->_frames = array();
+			$this->_frameset_nesting_level = 0;
+			$this->_text = false;
+			if ($response) {
+				$this->_extractResponse($response);
+			} else {
+				$this->_noResponse();
+			}
+		}
+
+		/**
+		 *    Extracts all of the response information.
+		 *    @param SimpleHttpResponse $response    Response being parsed.
+		 *    @access private
+		 */
+		function _extractResponse($response) {
+			$this->_transport_error = $response->getError();
+			$this->_raw = $response->getContent();
+			$this->_sent = $response->getSent();
+			$this->_headers = $response->getHeaders();
+			$this->_method = $response->getMethod();
+			$this->_url = $response->getUrl();
+			$this->_request_data = $response->getRequestData();
+		}
+
+		/**
+		 *    Sets up a missing response.
+		 *    @access private
+		 */
+		function _noResponse() {
+			$this->_transport_error = 'No page fetched yet';
+			$this->_raw = false;
+			$this->_sent = false;
+			$this->_headers = false;
+			$this->_method = 'GET';
+			$this->_url = false;
+			$this->_request_data = false;
+		}
+
+		/**
+		 *    Original request as bytes sent down the wire.
+		 *    @return mixed              Sent content.
+		 *    @access public
+		 */
+		function getRequest() {
+			return $this->_sent;
+		}
+
+		/**
+		 *    Accessor for raw text of page.
+		 *    @return string        Raw unparsed content.
+		 *    @access public
+		 */
+		function getRaw() {
+			return $this->_raw;
+		}
+
+		/**
+		 *    Accessor for plain text of page as a text browser
+		 *    would see it.
+		 *    @return string        Plain text of page.
+		 *    @access public
+		 */
+		function getText() {
+			if (! $this->_text) {
+				$this->_text = SimpleHtmlSaxParser::normalise($this->_raw);
+			}
+			return $this->_text;
+		}
+
+		/**
+		 *    Accessor for raw headers of page.
+		 *    @return string       Header block as text.
+		 *    @access public
+		 */
+		function getHeaders() {
+			if ($this->_headers) {
+				return $this->_headers->getRaw();
+			}
+			return false;
+		}
+
+		/**
+		 *    Original request method.
+		 *    @return string        GET, POST or HEAD.
+		 *    @access public
+		 */
+		function getMethod() {
+			return $this->_method;
+		}
+
+		/**
+		 *    Original 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->_request_data;
+		}
+
+		/**
+		 *    Accessor for last error.
+		 *    @return string        Error from last response.
+		 *    @access public
+		 */
+		function getTransportError() {
+			return $this->_transport_error;
+		}
+
+		/**
+		 *    Accessor for current MIME type.
+		 *    @return string    MIME type as string; e.g. 'text/html'
+		 *    @access public
+		 */
+		function getMimeType() {
+			if ($this->_headers) {
+				return $this->_headers->getMimeType();
+			}
+			return false;
+		}
+
+		/**
+		 *    Accessor for HTTP response code.
+		 *    @return integer    HTTP response code received.
+		 *    @access public
+		 */
+		function getResponseCode() {
+			if ($this->_headers) {
+				return $this->_headers->getResponseCode();
+			}
+			return false;
+		}
+
+		/**
+		 *    Accessor for last Authentication type. Only valid
+		 *    straight after a challenge (401).
+		 *    @return string    Description of challenge type.
+		 *    @access public
+		 */
+		function getAuthentication() {
+			if ($this->_headers) {
+				return $this->_headers->getAuthentication();
+			}
+			return false;
+		}
+
+		/**
+		 *    Accessor for last Authentication realm. Only valid
+		 *    straight after a challenge (401).
+		 *    @return string    Name of security realm.
+		 *    @access public
+		 */
+		function getRealm() {
+			if ($this->_headers) {
+				return $this->_headers->getRealm();
+			}
+			return false;
+		}
+
+		/**
+		 *    Accessor for current frame focus. Will be
+		 *    false as no frames.
+		 *    @return array    Always empty.
+		 *    @access public
+		 */
+		function getFrameFocus() {
+			return array();
+		}
+
+		/**
+		 *    Sets the focus by index. The integer index starts from 1.
+		 *    @param integer $choice    Chosen frame.
+		 *    @return boolean           Always false.
+		 *    @access public
+		 */
+		function setFrameFocusByIndex($choice) {
+			return false;
+		}
+
+		/**
+		 *    Sets the focus by name. Always fails for a leaf page.
+		 *    @param string $name    Chosen frame.
+		 *    @return boolean        False as no frames.
+		 *    @access public
+		 */
+		function setFrameFocus($name) {
+			return false;
+		}
+
+		/**
+		 *    Clears the frame focus. Does nothing for a leaf page.
+		 *    @access public
+		 */
+		function clearFrameFocus() {
+		}
+
+		/**
+		 *    Adds a tag to the page.
+		 *    @param SimpleTag $tag        Tag to accept.
+		 *    @access public
+		 */
+		function acceptTag($tag) {
+			if ($tag->getTagName() == "a") {
+				$this->_addLink($tag);
+			} elseif ($tag->getTagName() == "title") {
+				$this->_setTitle($tag);
+			} elseif ($this->_isFormElement($tag->getTagName())) {
+				for ($i = 0; $i < count($this->_open_forms); $i++) {
+					$this->_open_forms[$i]->addWidget($tag);
+				}
+				$this->_last_widget = $tag;
+			}
+		}
+
+		/**
+		 *    Opens a label for a described widget.
+		 *    @param SimpleFormTag $tag      Tag to accept.
+		 *    @access public
+		 */
+		function acceptLabelStart($tag) {
+			$this->_label = $tag;
+			unset($this->_last_widget);
+		}
+
+		/**
+		 *    Closes the most recently opened label.
+		 *    @access public
+		 */
+		function acceptLabelEnd() {
+			if (isset($this->_label)) {
+				if (isset($this->_last_widget)) {
+					$this->_last_widget->setLabel($this->_label->getText());
+					unset($this->_last_widget);
+				} else {
+					$this->_left_over_labels[] = SimpleTestCompatibility::copy($this->_label);
+				}
+				unset($this->_label);
+			}
+		}
+
+		/**
+		 *    Tests to see if a tag is a possible form
+		 *    element.
+		 *    @param string $name     HTML element name.
+		 *    @return boolean         True if form element.
+		 *    @access private
+		 */
+		function _isFormElement($name) {
+			return in_array($name, array('input', 'button', 'textarea', 'select'));
+		}
+
+		/**
+		 *    Opens a form. New widgets go here.
+		 *    @param SimpleFormTag $tag      Tag to accept.
+		 *    @access public
+		 */
+		function acceptFormStart($tag) {
+			$this->_open_forms[] = new SimpleForm($tag, $this->getUrl());
+		}
+
+		/**
+		 *    Closes the most recently opened form.
+		 *    @access public
+		 */
+		function acceptFormEnd() {
+			if (count($this->_open_forms)) {
+				$this->_complete_forms[] = array_pop($this->_open_forms);
+			}
+		}
+
+		/**
+		 *    Opens a frameset. A frameset may contain nested
+		 *    frameset tags.
+		 *    @param SimpleFramesetTag $tag      Tag to accept.
+		 *    @access public
+		 */
+		function acceptFramesetStart($tag) {
+			if (! $this->_isLoadingFrames()) {
+				$this->_frameset = $tag;
+			}
+			$this->_frameset_nesting_level++;
+		}
+
+		/**
+		 *    Closes the most recently opened frameset.
+		 *    @access public
+		 */
+		function acceptFramesetEnd() {
+			if ($this->_isLoadingFrames()) {
+				$this->_frameset_nesting_level--;
+			}
+		}
+
+		/**
+		 *    Takes a single frame tag and stashes it in
+		 *    the current frame set.
+		 *    @param SimpleFrameTag $tag      Tag to accept.
+		 *    @access public
+		 */
+		function acceptFrame($tag) {
+			if ($this->_isLoadingFrames()) {
+				if ($tag->getAttribute('src')) {
+					$this->_frames[] = $tag;
+				}
+			}
+		}
+
+		/**
+		 *    Test to see if in the middle of reading
+		 *    a frameset.
+		 *    @return boolean        True if inframeset.
+		 *    @access private
+		 */
+		function _isLoadingFrames() {
+			if (! $this->_frameset) {
+				return false;
+			}
+			return ($this->_frameset_nesting_level > 0);
+		}
+
+		/**
+		 *    Test to see if link is an absolute one.
+		 *    @param string $url     Url to test.
+		 *    @return boolean        True if absolute.
+		 *    @access protected
+		 */
+		function _linkIsAbsolute($url) {
+			$parsed = new SimpleUrl($url);
+			return (boolean)($parsed->getScheme() && $parsed->getHost());
+		}
+
+		/**
+		 *    Adds a link to the page.
+		 *    @param SimpleAnchorTag $tag      Link to accept.
+		 *    @access protected
+		 */
+		function _addLink($tag) {
+			$this->_links[] = $tag;
+		}
+
+		/**
+		 *    Marker for end of complete page. Any work in
+		 *    progress can now be closed.
+		 *    @access public
+		 */
+		function acceptPageEnd() {
+			while (count($this->_open_forms)) {
+				$this->_complete_forms[] = array_pop($this->_open_forms);
+			}
+			foreach ($this->_left_over_labels as $label) {
+				for ($i = 0, $count = count($this->_complete_forms); $i < $count; $i++) {
+					$this->_complete_forms[$i]->attachLabelBySelector(
+							new SimpleById($label->getFor()),
+							$label->getText());
+				}
+			}
+		}
+
+		/**
+		 *    Test for the presence of a frameset.
+		 *    @return boolean        True if frameset.
+		 *    @access public
+		 */
+		function hasFrames() {
+			return (boolean)$this->_frameset;
+		}
+
+		/**
+		 *    Accessor for frame name and source URL for every frame that
+		 *    will need to be loaded. Immediate children only.
+		 *    @return boolean/array     False if no frameset or
+		 *                              otherwise a hash of frame URLs.
+		 *                              The key is either a numerical
+		 *                              base one index or the name attribute.
+		 *    @access public
+		 */
+		function getFrameset() {
+			if (! $this->_frameset) {
+				return false;
+			}
+			$urls = array();
+			for ($i = 0; $i < count($this->_frames); $i++) {
+				$name = $this->_frames[$i]->getAttribute('name');
+				$url = new SimpleUrl($this->_frames[$i]->getAttribute('src'));
+				$urls[$name ? $name : $i + 1] = $url->makeAbsolute($this->getUrl());
+			}
+			return $urls;
+		}
+
+		/**
+		 *    Fetches a list of loaded frames.
+		 *    @return array/string    Just the URL for a single page.
+		 *    @access public
+		 */
+		function getFrames() {
+			$url = $this->getUrl();
+			return $url->asString();
+		}
+
+		/**
+		 *    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() {
+			$all = array();
+			foreach ($this->_links as $link) {
+				if ($this->_linkIsAbsolute($link->getHref())) {
+					$all[] = $link->getHref();
+				}
+			}
+			return $all;
+		}
+
+		/**
+		 *    Accessor for a list of all relative links.
+		 *    @return array      List of urls without hostname.
+		 *    @access public
+		 */
+		function getRelativeUrls() {
+			$all = array();
+			foreach ($this->_links as $link) {
+				if (! $this->_linkIsAbsolute($link->getHref())) {
+					$all[] = $link->getHref();
+				}
+			}
+			return $all;
+		}
+
+		/**
+		 *    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) {
+			$matches = array();
+			foreach ($this->_links as $link) {
+				if ($link->getText() == $label) {
+					$matches[] = $this->_getUrlFromLink($link);
+				}
+			}
+			return $matches;
+		}
+
+		/**
+		 *    Accessor for a URL by the id attribute.
+		 *    @param string $id       Id attribute of link.
+		 *    @return SimpleUrl       URL with that id of false if none.
+		 *    @access public
+		 */
+		function getUrlById($id) {
+			foreach ($this->_links as $link) {
+				if ($link->getAttribute('id') === (string)$id) {
+					return $this->_getUrlFromLink($link);
+				}
+			}
+			return false;
+		}
+
+		/**
+		 *    Converts a link into a target URL.
+		 *    @param SimpleAnchor $link    Parsed link.
+		 *    @return SimpleUrl            URL with frame target if any.
+		 *    @access private
+		 */
+		function _getUrlFromLink($link) {
+			$url = $this->_makeAbsolute($link->getHref());
+			if ($link->getAttribute('target')) {
+				$url->setTarget($link->getAttribute('target'));
+			}
+			return $url;
+		}
+
+		/**
+		 *    Expands expandomatic URLs into fully qualified
+		 *    URLs.
+		 *    @param SimpleUrl $url        Relative URL.
+		 *    @return SimpleUrl            Absolute URL.
+		 *    @access protected
+		 */
+		function _makeAbsolute($url) {
+			if (! is_object($url)) {
+				$url = new SimpleUrl($url);
+			}
+			return $url->makeAbsolute($this->getUrl());
+		}
+
+		/**
+		 *    Sets the title tag contents.
+		 *    @param SimpleTitleTag $tag    Title of page.
+		 *    @access protected
+		 */
+		function _setTitle($tag) {
+			$this->_title = $tag;
+		}
+
+		/**
+		 *    Accessor for parsed title.
+		 *    @return string     Title or false if no title is present.
+		 *    @access public
+		 */
+		function getTitle() {
+			if ($this->_title) {
+				return $this->_title->getText();
+			}
+			return false;
+		}
+
+		/**
+		 *    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) {
+			for ($i = 0; $i < count($this->_complete_forms); $i++) {
+				if ($this->_complete_forms[$i]->hasSubmit($selector)) {
+					return $this->_complete_forms[$i];
+				}
+			}
+			$null = null;
+			return $null;
+		}
+
+		/**
+		 *    Finds a held form by image using a selector.
+		 *    Will only search correctly built forms.
+		 *    @param SimpleSelector $selector  Image finder.
+		 *    @return SimpleForm               Form object containing
+		 *                                     the image.
+		 *    @access public
+		 */
+		function &getFormByImage($selector) {
+			for ($i = 0; $i < count($this->_complete_forms); $i++) {
+				if ($this->_complete_forms[$i]->hasImage($selector)) {
+					return $this->_complete_forms[$i];
+				}
+			}
+			$null = null;
+			return $null;
+		}
+
+		/**
+		 *    Finds a held form by the form ID. A way of
+		 *    identifying a specific form when we have control
+		 *    of the HTML code.
+		 *    @param string $id     Form label.
+		 *    @return SimpleForm    Form object containing the matching ID.
+		 *    @access public
+		 */
+		function &getFormById($id) {
+			for ($i = 0; $i < count($this->_complete_forms); $i++) {
+				if ($this->_complete_forms[$i]->getId() == $id) {
+					return $this->_complete_forms[$i];
+				}
+			}
+			$null = null;
+			return $null;
+		}
+
+		/**
+		 *    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) {
+			$is_set = false;
+			for ($i = 0; $i < count($this->_complete_forms); $i++) {
+				if ($this->_complete_forms[$i]->setField($selector, $value)) {
+					$is_set = true;
+				}
+			}
+			return $is_set;
+		}
+
+		/**
+		 *    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->_complete_forms); $i++) {
+				$value = $this->_complete_forms[$i]->getValue($selector);
+				if (isset($value)) {
+					return $value;
+				}
+			}
+			return null;
+		}
+	}

Spacing +13 added lines, -13 removed lines

@@ -75,7 +75,7 @@ 
          *    @access protected
          */
         function _createInputTag($attributes) {
-            if (! isset($attributes['type'])) {
+            if (!isset($attributes['type'])) {
                 return new SimpleTextTag($attributes);
             }
             $type = strtolower(trim($attributes['type']));
@@ -189,7 +189,7 @@ 
         function startElement($name, $attributes) {
             $factory = new SimpleTagBuilder();
             $tag = $factory->createTag($name, $attributes);
-            if (! $tag) {
+            if (!$tag) {
                 return true;
             }
             if ($tag->getTagName() == 'label') {
@@ -209,7 +209,7 @@ 
                 $this->_page->acceptFrame($tag);
                 return true;
             }
-            if ($tag->isPrivateContent() && ! isset($this->_private_content_tag)) {
+            if ($tag->isPrivateContent() && !isset($this->_private_content_tag)) {
                 $this->_private_content_tag = $tag;
             }
             if ($tag->expectEndTag()) {
@@ -318,7 +318,7 @@ 
          */
         function _openTag($tag) {
             $name = $tag->getTagName();
-            if (! in_array($name, array_keys($this->_tags))) {
+            if (!in_array($name, array_keys($this->_tags))) {
                 $this->_tags[$name] = array();
             }
             $this->_tags[$name][] = $tag;
@@ -426,7 +426,7 @@ 
          *    @access public
          */
         function getText() {
-            if (! $this->_text) {
+            if (!$this->_text) {
                 $this->_text = SimpleHtmlSaxParser::normalise($this->_raw);
             }
             return $this->_text;
@@ -648,7 +648,7 @@ 
          *    @access public
          */
         function acceptFramesetStart($tag) {
-            if (! $this->_isLoadingFrames()) {
+            if (!$this->_isLoadingFrames()) {
                 $this->_frameset = $tag;
             }
             $this->_frameset_nesting_level++;
@@ -685,7 +685,7 @@ 
          *    @access private
          */
         function _isLoadingFrames() {
-            if (! $this->_frameset) {
+            if (!$this->_frameset) {
                 return false;
             }
             return ($this->_frameset_nesting_level > 0);
@@ -699,7 +699,7 @@ 
          */
         function _linkIsAbsolute($url) {
             $parsed = new SimpleUrl($url);
-            return (boolean)($parsed->getScheme() && $parsed->getHost());
+            return (boolean) ($parsed->getScheme() && $parsed->getHost());
         }
 
         /**
@@ -735,7 +735,7 @@ 
          *    @access public
          */
         function hasFrames() {
-            return (boolean)$this->_frameset;
+            return (boolean) $this->_frameset;
         }
 
         /**
@@ -748,7 +748,7 @@ 
          *    @access public
          */
         function getFrameset() {
-            if (! $this->_frameset) {
+            if (!$this->_frameset) {
                 return false;
             }
             $urls = array();
@@ -794,7 +794,7 @@ 
         function getRelativeUrls() {
             $all = array();
             foreach ($this->_links as $link) {
-                if (! $this->_linkIsAbsolute($link->getHref())) {
+                if (!$this->_linkIsAbsolute($link->getHref())) {
                     $all[] = $link->getHref();
                 }
             }
@@ -826,7 +826,7 @@ 
          */
         function getUrlById($id) {
             foreach ($this->_links as $link) {
-                if ($link->getAttribute('id') === (string)$id) {
+                if ($link->getAttribute('id') === (string) $id) {
                     return $this->_getUrlFromLink($link);
                 }
             }
@@ -855,7 +855,7 @@ 
          *    @access protected
          */
         function _makeAbsolute($url) {
-            if (! is_object($url)) {
+            if (!is_object($url)) {
                 $url = new SimpleUrl($url);
             }
             return $url->makeAbsolute($this->getUrl());

tests/test_tools/simpletest/parser.php

Doc Comments +9 added lines, -11 removed lines

@@ -98,8 +98,6 @@ 
          *    regular expression separated with the
          *    "or" operator. Caches the regex.
          *    Will automatically escape (, ) and / tokens.
-         *    @param array $patterns    List of patterns in order.
-         *    @access private
          */
         function _getCompoundedRegex() {
             if ($this->_regex == null) {
@@ -476,7 +474,7 @@ 
 
         /**
          *    List of parsed tags. Others are ignored.
-         *    @return array        List of searched for tags.
+         *    @return string[]        List of searched for tags.
          *    @access private
          */
         function _getParsedTags() {
@@ -581,7 +579,7 @@ 
 
         /**
          *    Sets up the matching lexer. Starts in 'text' mode.
-         *    @param SimpleSaxParser $parser    Event generator, usually $self.
+         *    @param SimpleHtmlSaxParser $parser    Event generator, usually $self.
          *    @return SimpleLexer               Lexer suitable for this parser.
          *    @access public
          *    @static
@@ -599,7 +597,7 @@ 
          *    name is converted to lower case.
          *    @param string $token     Incoming characters.
          *    @param integer $event    Lexer event type.
-         *    @return boolean          False if parse error.
+         *    @return boolean|null          False if parse error.
          *    @access public
          */
         function acceptStartToken($token, $event) {
@@ -627,7 +625,7 @@ 
          *    The element name is converted to lower case.
          *    @param string $token     Incoming characters.
          *    @param integer $event    Lexer event type.
-         *    @return boolean          False if parse error.
+         *    @return boolean|null          False if parse error.
          *    @access public
          */
         function acceptEndToken($token, $event) {
@@ -660,7 +658,7 @@ 
          *    A character entity.
          *    @param string $token    Incoming characters.
          *    @param integer $event   Lexer event type.
-         *    @return boolean         False if parse error.
+         *    @return boolean|null         False if parse error.
          *    @access public
          */
         function acceptEntityToken($token, $event) {
@@ -671,7 +669,7 @@ 
          *    important.
          *    @param string $token     Incoming characters.
          *    @param integer $event    Lexer event type.
-         *    @return boolean          False if parse error.
+         *    @return boolean|null          False if parse error.
          *    @access public
          */
         function acceptTextToken($token, $event) {
@@ -746,7 +744,7 @@ 
          *    @param hash $attributes    Name value pairs.
          *                               Attributes without content
          *                               are marked as true.
-         *    @return boolean            False on parse error.
+         *    @return boolean|null            False on parse error.
          *    @access public
          */
         function startElement($name, $attributes) {
@@ -755,7 +753,7 @@ 
         /**
          *    End of element event.
          *    @param string $name        Element name.
-         *    @return boolean            False on parse error.
+         *    @return boolean|null            False on parse error.
          *    @access public
          */
         function endElement($name) {
@@ -764,7 +762,7 @@ 
         /**
          *    Unparsed, but relevant data.
          *    @param string $text        May include unparsed tags.
-         *    @return boolean            False on parse error.
+         *    @return boolean|null            False on parse error.
          *    @access public
          */
         function addContent($text) {

Indentation +757 added lines, -757 removed lines

@@ -1,772 +1,772 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	MockObjects
-     *	@version	$Id: parser.php 1532 2006-12-01 12:28:55Z xue $
-     */
-
-    /**#@+
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	MockObjects
+	 *	@version	$Id: parser.php 1532 2006-12-01 12:28:55Z xue $
+	 */
+
+	/**#@+
      * Lexer mode stack constants
      */
-    if (! defined('LEXER_ENTER')) {
-        define('LEXER_ENTER', 1);
-    }
-    if (! defined('LEXER_MATCHED')) {
-        define('LEXER_MATCHED', 2);
-    }
-    if (! defined('LEXER_UNMATCHED')) {
-        define('LEXER_UNMATCHED', 3);
-    }
-    if (! defined('LEXER_EXIT')) {
-        define('LEXER_EXIT', 4);
-    }
-    if (! defined('LEXER_SPECIAL')) {
-        define('LEXER_SPECIAL', 5);
-    }
-    /**#@-*/
-
-    /**
-     *    Compounded regular expression. Any of
-     *    the contained patterns could match and
-     *    when one does, it's label is returned.
+	if (! defined('LEXER_ENTER')) {
+		define('LEXER_ENTER', 1);
+	}
+	if (! defined('LEXER_MATCHED')) {
+		define('LEXER_MATCHED', 2);
+	}
+	if (! defined('LEXER_UNMATCHED')) {
+		define('LEXER_UNMATCHED', 3);
+	}
+	if (! defined('LEXER_EXIT')) {
+		define('LEXER_EXIT', 4);
+	}
+	if (! defined('LEXER_SPECIAL')) {
+		define('LEXER_SPECIAL', 5);
+	}
+	/**#@-*/
+
+	/**
+	 *    Compounded regular expression. Any of
+	 *    the contained patterns could match and
+	 *    when one does, it's label is returned.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class ParallelRegex {
-        protected $_patterns;
-        protected $_labels;
-        protected $_regex;
-        protected $_case;
-
-        /**
-         *    Constructor. Starts with no patterns.
-         *    @param boolean $case    True for case sensitive, false
-         *                            for insensitive.
-         *    @access public
-         */
-        function ParallelRegex($case) {
-            $this->_case = $case;
-            $this->_patterns = array();
-            $this->_labels = array();
-            $this->_regex = null;
-        }
-
-        /**
-         *    Adds a pattern with an optional label.
-         *    @param string $pattern      Perl style regex, but ( and )
-         *                                lose the usual meaning.
-         *    @param string $label        Label of regex to be returned
-         *                                on a match.
-         *    @access public
-         */
-        function addPattern($pattern, $label = true) {
-            $count = count($this->_patterns);
-            $this->_patterns[$count] = $pattern;
-            $this->_labels[$count] = $label;
-            $this->_regex = null;
-        }
-
-        /**
-         *    Attempts to match all patterns at once against
-         *    a string.
-         *    @param string $subject      String to match against.
-         *    @param string $match        First matched portion of
-         *                                subject.
-         *    @return boolean             True on success.
-         *    @access public
-         */
-        function match($subject, $match) {
-            if (count($this->_patterns) == 0) {
-                return false;
-            }
-            if (! preg_match($this->_getCompoundedRegex(), $subject, $matches)) {
-                $match = '';
-                return false;
-            }
-            $match = $matches[0];
-            for ($i = 1; $i < count($matches); $i++) {
-                if ($matches[$i]) {
-                    return $this->_labels[$i - 1];
-                }
-            }
-            return true;
-        }
-
-        /**
-         *    Compounds the patterns into a single
-         *    regular expression separated with the
-         *    "or" operator. Caches the regex.
-         *    Will automatically escape (, ) and / tokens.
-         *    @param array $patterns    List of patterns in order.
-         *    @access private
-         */
-        function _getCompoundedRegex() {
-            if ($this->_regex == null) {
-                for ($i = 0, $count = count($this->_patterns); $i < $count; $i++) {
-                    $this->_patterns[$i] = '(' . str_replace(
-                            array('/', '(', ')'),
-                            array('\/', '\(', '\)'),
-                            $this->_patterns[$i]) . ')';
-                }
-                $this->_regex = "/" . implode("|", $this->_patterns) . "/" . $this->_getPerlMatchingFlags();
-            }
-            return $this->_regex;
-        }
-
-        /**
-         *    Accessor for perl regex mode flags to use.
-         *    @return string       Perl regex flags.
-         *    @access private
-         */
-        function _getPerlMatchingFlags() {
-            return ($this->_case ? "msS" : "msSi");
-        }
-    }
-
-    /**
-     *    States for a stack machine.
+	 */
+	class ParallelRegex {
+		protected $_patterns;
+		protected $_labels;
+		protected $_regex;
+		protected $_case;
+
+		/**
+		 *    Constructor. Starts with no patterns.
+		 *    @param boolean $case    True for case sensitive, false
+		 *                            for insensitive.
+		 *    @access public
+		 */
+		function ParallelRegex($case) {
+			$this->_case = $case;
+			$this->_patterns = array();
+			$this->_labels = array();
+			$this->_regex = null;
+		}
+
+		/**
+		 *    Adds a pattern with an optional label.
+		 *    @param string $pattern      Perl style regex, but ( and )
+		 *                                lose the usual meaning.
+		 *    @param string $label        Label of regex to be returned
+		 *                                on a match.
+		 *    @access public
+		 */
+		function addPattern($pattern, $label = true) {
+			$count = count($this->_patterns);
+			$this->_patterns[$count] = $pattern;
+			$this->_labels[$count] = $label;
+			$this->_regex = null;
+		}
+
+		/**
+		 *    Attempts to match all patterns at once against
+		 *    a string.
+		 *    @param string $subject      String to match against.
+		 *    @param string $match        First matched portion of
+		 *                                subject.
+		 *    @return boolean             True on success.
+		 *    @access public
+		 */
+		function match($subject, $match) {
+			if (count($this->_patterns) == 0) {
+				return false;
+			}
+			if (! preg_match($this->_getCompoundedRegex(), $subject, $matches)) {
+				$match = '';
+				return false;
+			}
+			$match = $matches[0];
+			for ($i = 1; $i < count($matches); $i++) {
+				if ($matches[$i]) {
+					return $this->_labels[$i - 1];
+				}
+			}
+			return true;
+		}
+
+		/**
+		 *    Compounds the patterns into a single
+		 *    regular expression separated with the
+		 *    "or" operator. Caches the regex.
+		 *    Will automatically escape (, ) and / tokens.
+		 *    @param array $patterns    List of patterns in order.
+		 *    @access private
+		 */
+		function _getCompoundedRegex() {
+			if ($this->_regex == null) {
+				for ($i = 0, $count = count($this->_patterns); $i < $count; $i++) {
+					$this->_patterns[$i] = '(' . str_replace(
+							array('/', '(', ')'),
+							array('\/', '\(', '\)'),
+							$this->_patterns[$i]) . ')';
+				}
+				$this->_regex = "/" . implode("|", $this->_patterns) . "/" . $this->_getPerlMatchingFlags();
+			}
+			return $this->_regex;
+		}
+
+		/**
+		 *    Accessor for perl regex mode flags to use.
+		 *    @return string       Perl regex flags.
+		 *    @access private
+		 */
+		function _getPerlMatchingFlags() {
+			return ($this->_case ? "msS" : "msSi");
+		}
+	}
+
+	/**
+	 *    States for a stack machine.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleStateStack {
-        protected $_stack;
-
-        /**
-         *    Constructor. Starts in named state.
-         *    @param string $start        Starting state name.
-         *    @access public
-         */
-        function SimpleStateStack($start) {
-            $this->_stack = array($start);
-        }
-
-        /**
-         *    Accessor for current state.
-         *    @return string       State.
-         *    @access public
-         */
-        function getCurrent() {
-            return $this->_stack[count($this->_stack) - 1];
-        }
-
-        /**
-         *    Adds a state to the stack and sets it
-         *    to be the current state.
-         *    @param string $state        New state.
-         *    @access public
-         */
-        function enter($state) {
-            array_push($this->_stack, $state);
-        }
-
-        /**
-         *    Leaves the current state and reverts
-         *    to the previous one.
-         *    @return boolean    False if we drop off
-         *                       the bottom of the list.
-         *    @access public
-         */
-        function leave() {
-            if (count($this->_stack) == 1) {
-                return false;
-            }
-            array_pop($this->_stack);
-            return true;
-        }
-    }
-
-    /**
-     *    Accepts text and breaks it into tokens.
-     *    Some optimisation to make the sure the
-     *    content is only scanned by the PHP regex
-     *    parser once. Lexer modes must not start
-     *    with leading underscores.
+	 */
+	class SimpleStateStack {
+		protected $_stack;
+
+		/**
+		 *    Constructor. Starts in named state.
+		 *    @param string $start        Starting state name.
+		 *    @access public
+		 */
+		function SimpleStateStack($start) {
+			$this->_stack = array($start);
+		}
+
+		/**
+		 *    Accessor for current state.
+		 *    @return string       State.
+		 *    @access public
+		 */
+		function getCurrent() {
+			return $this->_stack[count($this->_stack) - 1];
+		}
+
+		/**
+		 *    Adds a state to the stack and sets it
+		 *    to be the current state.
+		 *    @param string $state        New state.
+		 *    @access public
+		 */
+		function enter($state) {
+			array_push($this->_stack, $state);
+		}
+
+		/**
+		 *    Leaves the current state and reverts
+		 *    to the previous one.
+		 *    @return boolean    False if we drop off
+		 *                       the bottom of the list.
+		 *    @access public
+		 */
+		function leave() {
+			if (count($this->_stack) == 1) {
+				return false;
+			}
+			array_pop($this->_stack);
+			return true;
+		}
+	}
+
+	/**
+	 *    Accepts text and breaks it into tokens.
+	 *    Some optimisation to make the sure the
+	 *    content is only scanned by the PHP regex
+	 *    parser once. Lexer modes must not start
+	 *    with leading underscores.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleLexer {
-        protected $_regexes;
-        protected $_parser;
-        protected $_mode;
-        protected $_mode_handlers;
-        protected $_case;
-
-        /**
-         *    Sets up the lexer in case insensitive matching
-         *    by default.
-         *    @param SimpleSaxParser $parser  Handling strategy by
-         *                                    reference.
-         *    @param string $start            Starting handler.
-         *    @param boolean $case            True for case sensitive.
-         *    @access public
-         */
-        function SimpleLexer($parser, $start = "accept", $case = false) {
-            $this->_case = $case;
-            $this->_regexes = array();
-            $this->_parser = $parser;
-            $this->_mode = new SimpleStateStack($start);
-            $this->_mode_handlers = array($start => $start);
-        }
-
-        /**
-         *    Adds a token search pattern for a particular
-         *    parsing mode. The pattern does not change the
-         *    current mode.
-         *    @param string $pattern      Perl style regex, but ( and )
-         *                                lose the usual meaning.
-         *    @param string $mode         Should only apply this
-         *                                pattern when dealing with
-         *                                this type of input.
-         *    @access public
-         */
-        function addPattern($pattern, $mode = "accept") {
-            if (! isset($this->_regexes[$mode])) {
-                $this->_regexes[$mode] = new ParallelRegex($this->_case);
-            }
-            $this->_regexes[$mode]->addPattern($pattern);
-            if (! isset($this->_mode_handlers[$mode])) {
-                $this->_mode_handlers[$mode] = $mode;
-            }
-        }
-
-        /**
-         *    Adds a pattern that will enter a new parsing
-         *    mode. Useful for entering parenthesis, strings,
-         *    tags, etc.
-         *    @param string $pattern      Perl style regex, but ( and )
-         *                                lose the usual meaning.
-         *    @param string $mode         Should only apply this
-         *                                pattern when dealing with
-         *                                this type of input.
-         *    @param string $new_mode     Change parsing to this new
-         *                                nested mode.
-         *    @access public
-         */
-        function addEntryPattern($pattern, $mode, $new_mode) {
-            if (! isset($this->_regexes[$mode])) {
-                $this->_regexes[$mode] = new ParallelRegex($this->_case);
-            }
-            $this->_regexes[$mode]->addPattern($pattern, $new_mode);
-            if (! isset($this->_mode_handlers[$new_mode])) {
-                $this->_mode_handlers[$new_mode] = $new_mode;
-            }
-        }
-
-        /**
-         *    Adds a pattern that will exit the current mode
-         *    and re-enter the previous one.
-         *    @param string $pattern      Perl style regex, but ( and )
-         *                                lose the usual meaning.
-         *    @param string $mode         Mode to leave.
-         *    @access public
-         */
-        function addExitPattern($pattern, $mode) {
-            if (! isset($this->_regexes[$mode])) {
-                $this->_regexes[$mode] = new ParallelRegex($this->_case);
-            }
-            $this->_regexes[$mode]->addPattern($pattern, "__exit");
-            if (! isset($this->_mode_handlers[$mode])) {
-                $this->_mode_handlers[$mode] = $mode;
-            }
-        }
-
-        /**
-         *    Adds a pattern that has a special mode. Acts as an entry
-         *    and exit pattern in one go, effectively calling a special
-         *    parser handler for this token only.
-         *    @param string $pattern      Perl style regex, but ( and )
-         *                                lose the usual meaning.
-         *    @param string $mode         Should only apply this
-         *                                pattern when dealing with
-         *                                this type of input.
-         *    @param string $special      Use this mode for this one token.
-         *    @access public
-         */
-        function addSpecialPattern($pattern, $mode, $special) {
-            if (! isset($this->_regexes[$mode])) {
-                $this->_regexes[$mode] = new ParallelRegex($this->_case);
-            }
-            $this->_regexes[$mode]->addPattern($pattern, "_$special");
-            if (! isset($this->_mode_handlers[$special])) {
-                $this->_mode_handlers[$special] = $special;
-            }
-        }
-
-        /**
-         *    Adds a mapping from a mode to another handler.
-         *    @param string $mode        Mode to be remapped.
-         *    @param string $handler     New target handler.
-         *    @access public
-         */
-        function mapHandler($mode, $handler) {
-            $this->_mode_handlers[$mode] = $handler;
-        }
-
-        /**
-         *    Splits the page text into tokens. Will fail
-         *    if the handlers report an error or if no
-         *    content is consumed. If successful then each
-         *    unparsed and parsed token invokes a call to the
-         *    held listener.
-         *    @param string $raw        Raw HTML text.
-         *    @return boolean           True on success, else false.
-         *    @access public
-         */
-        function parse($raw) {
-            if (! isset($this->_parser)) {
-                return false;
-            }
-            $length = strlen($raw);
-            while (is_array($parsed = $this->_reduce($raw))) {
-                list($raw, $unmatched, $matched, $mode) = $parsed;
-                if (! $this->_dispatchTokens($unmatched, $matched, $mode)) {
-                    return false;
-                }
-                if ($raw === '') {
-                    return true;
-                }
-                if (strlen($raw) == $length) {
-                    return false;
-                }
-                $length = strlen($raw);
-            }
-            if (! $parsed) {
-                return false;
-            }
-            return $this->_invokeParser($raw, LEXER_UNMATCHED);
-        }
-
-        /**
-         *    Sends the matched token and any leading unmatched
-         *    text to the parser changing the lexer to a new
-         *    mode if one is listed.
-         *    @param string $unmatched    Unmatched leading portion.
-         *    @param string $matched      Actual token match.
-         *    @param string $mode         Mode after match. A boolean
-         *                                false mode causes no change.
-         *    @return boolean             False if there was any error
-         *                                from the parser.
-         *    @access private
-         */
-        function _dispatchTokens($unmatched, $matched, $mode = false) {
-            if (! $this->_invokeParser($unmatched, LEXER_UNMATCHED)) {
-                return false;
-            }
-            if (is_bool($mode)) {
-                return $this->_invokeParser($matched, LEXER_MATCHED);
-            }
-            if ($this->_isModeEnd($mode)) {
-                if (! $this->_invokeParser($matched, LEXER_EXIT)) {
-                    return false;
-                }
-                return $this->_mode->leave();
-            }
-            if ($this->_isSpecialMode($mode)) {
-                $this->_mode->enter($this->_decodeSpecial($mode));
-                if (! $this->_invokeParser($matched, LEXER_SPECIAL)) {
-                    return false;
-                }
-                return $this->_mode->leave();
-            }
-            $this->_mode->enter($mode);
-            return $this->_invokeParser($matched, LEXER_ENTER);
-        }
-
-        /**
-         *    Tests to see if the new mode is actually to leave
-         *    the current mode and pop an item from the matching
-         *    mode stack.
-         *    @param string $mode    Mode to test.
-         *    @return boolean        True if this is the exit mode.
-         *    @access private
-         */
-        function _isModeEnd($mode) {
-            return ($mode === "__exit");
-        }
-
-        /**
-         *    Test to see if the mode is one where this mode
-         *    is entered for this token only and automatically
-         *    leaves immediately afterwoods.
-         *    @param string $mode    Mode to test.
-         *    @return boolean        True if this is the exit mode.
-         *    @access private
-         */
-        function _isSpecialMode($mode) {
-            return (strncmp($mode, "_", 1) == 0);
-        }
-
-        /**
-         *    Strips the magic underscore marking single token
-         *    modes.
-         *    @param string $mode    Mode to decode.
-         *    @return string         Underlying mode name.
-         *    @access private
-         */
-        function _decodeSpecial($mode) {
-            return substr($mode, 1);
-        }
-
-        /**
-         *    Calls the parser method named after the current
-         *    mode. Empty content will be ignored. The lexer
-         *    has a parser handler for each mode in the lexer.
-         *    @param string $content        Text parsed.
-         *    @param boolean $is_match      Token is recognised rather
-         *                                  than unparsed data.
-         *    @access private
-         */
-        function _invokeParser($content, $is_match) {
-            if (($content === '') || ($content === false)) {
-                return true;
-            }
-            $handler = $this->_mode_handlers[$this->_mode->getCurrent()];
-            return $this->_parser->$handler($content, $is_match);
-        }
-
-        /**
-         *    Tries to match a chunk of text and if successful
-         *    removes the recognised chunk and any leading
-         *    unparsed data. Empty strings will not be matched.
-         *    @param string $raw         The subject to parse. This is the
-         *                               content that will be eaten.
-         *    @return array/boolean      Three item list of unparsed
-         *                               content followed by the
-         *                               recognised token and finally the
-         *                               action the parser is to take.
-         *                               True if no match, false if there
-         *                               is a parsing error.
-         *    @access private
-         */
-        function _reduce($raw) {
-            if ($action = $this->_regexes[$this->_mode->getCurrent()]->match($raw, $match)) {
-                $unparsed_character_count = strpos($raw, $match);
-                $unparsed = substr($raw, 0, $unparsed_character_count);
-                $raw = substr($raw, $unparsed_character_count + strlen($match));
-                return array($raw, $unparsed, $match, $action);
-            }
-            return true;
-        }
-    }
-
-    /**
-     *    Breas HTML into SAX events.
+	 */
+	class SimpleLexer {
+		protected $_regexes;
+		protected $_parser;
+		protected $_mode;
+		protected $_mode_handlers;
+		protected $_case;
+
+		/**
+		 *    Sets up the lexer in case insensitive matching
+		 *    by default.
+		 *    @param SimpleSaxParser $parser  Handling strategy by
+		 *                                    reference.
+		 *    @param string $start            Starting handler.
+		 *    @param boolean $case            True for case sensitive.
+		 *    @access public
+		 */
+		function SimpleLexer($parser, $start = "accept", $case = false) {
+			$this->_case = $case;
+			$this->_regexes = array();
+			$this->_parser = $parser;
+			$this->_mode = new SimpleStateStack($start);
+			$this->_mode_handlers = array($start => $start);
+		}
+
+		/**
+		 *    Adds a token search pattern for a particular
+		 *    parsing mode. The pattern does not change the
+		 *    current mode.
+		 *    @param string $pattern      Perl style regex, but ( and )
+		 *                                lose the usual meaning.
+		 *    @param string $mode         Should only apply this
+		 *                                pattern when dealing with
+		 *                                this type of input.
+		 *    @access public
+		 */
+		function addPattern($pattern, $mode = "accept") {
+			if (! isset($this->_regexes[$mode])) {
+				$this->_regexes[$mode] = new ParallelRegex($this->_case);
+			}
+			$this->_regexes[$mode]->addPattern($pattern);
+			if (! isset($this->_mode_handlers[$mode])) {
+				$this->_mode_handlers[$mode] = $mode;
+			}
+		}
+
+		/**
+		 *    Adds a pattern that will enter a new parsing
+		 *    mode. Useful for entering parenthesis, strings,
+		 *    tags, etc.
+		 *    @param string $pattern      Perl style regex, but ( and )
+		 *                                lose the usual meaning.
+		 *    @param string $mode         Should only apply this
+		 *                                pattern when dealing with
+		 *                                this type of input.
+		 *    @param string $new_mode     Change parsing to this new
+		 *                                nested mode.
+		 *    @access public
+		 */
+		function addEntryPattern($pattern, $mode, $new_mode) {
+			if (! isset($this->_regexes[$mode])) {
+				$this->_regexes[$mode] = new ParallelRegex($this->_case);
+			}
+			$this->_regexes[$mode]->addPattern($pattern, $new_mode);
+			if (! isset($this->_mode_handlers[$new_mode])) {
+				$this->_mode_handlers[$new_mode] = $new_mode;
+			}
+		}
+
+		/**
+		 *    Adds a pattern that will exit the current mode
+		 *    and re-enter the previous one.
+		 *    @param string $pattern      Perl style regex, but ( and )
+		 *                                lose the usual meaning.
+		 *    @param string $mode         Mode to leave.
+		 *    @access public
+		 */
+		function addExitPattern($pattern, $mode) {
+			if (! isset($this->_regexes[$mode])) {
+				$this->_regexes[$mode] = new ParallelRegex($this->_case);
+			}
+			$this->_regexes[$mode]->addPattern($pattern, "__exit");
+			if (! isset($this->_mode_handlers[$mode])) {
+				$this->_mode_handlers[$mode] = $mode;
+			}
+		}
+
+		/**
+		 *    Adds a pattern that has a special mode. Acts as an entry
+		 *    and exit pattern in one go, effectively calling a special
+		 *    parser handler for this token only.
+		 *    @param string $pattern      Perl style regex, but ( and )
+		 *                                lose the usual meaning.
+		 *    @param string $mode         Should only apply this
+		 *                                pattern when dealing with
+		 *                                this type of input.
+		 *    @param string $special      Use this mode for this one token.
+		 *    @access public
+		 */
+		function addSpecialPattern($pattern, $mode, $special) {
+			if (! isset($this->_regexes[$mode])) {
+				$this->_regexes[$mode] = new ParallelRegex($this->_case);
+			}
+			$this->_regexes[$mode]->addPattern($pattern, "_$special");
+			if (! isset($this->_mode_handlers[$special])) {
+				$this->_mode_handlers[$special] = $special;
+			}
+		}
+
+		/**
+		 *    Adds a mapping from a mode to another handler.
+		 *    @param string $mode        Mode to be remapped.
+		 *    @param string $handler     New target handler.
+		 *    @access public
+		 */
+		function mapHandler($mode, $handler) {
+			$this->_mode_handlers[$mode] = $handler;
+		}
+
+		/**
+		 *    Splits the page text into tokens. Will fail
+		 *    if the handlers report an error or if no
+		 *    content is consumed. If successful then each
+		 *    unparsed and parsed token invokes a call to the
+		 *    held listener.
+		 *    @param string $raw        Raw HTML text.
+		 *    @return boolean           True on success, else false.
+		 *    @access public
+		 */
+		function parse($raw) {
+			if (! isset($this->_parser)) {
+				return false;
+			}
+			$length = strlen($raw);
+			while (is_array($parsed = $this->_reduce($raw))) {
+				list($raw, $unmatched, $matched, $mode) = $parsed;
+				if (! $this->_dispatchTokens($unmatched, $matched, $mode)) {
+					return false;
+				}
+				if ($raw === '') {
+					return true;
+				}
+				if (strlen($raw) == $length) {
+					return false;
+				}
+				$length = strlen($raw);
+			}
+			if (! $parsed) {
+				return false;
+			}
+			return $this->_invokeParser($raw, LEXER_UNMATCHED);
+		}
+
+		/**
+		 *    Sends the matched token and any leading unmatched
+		 *    text to the parser changing the lexer to a new
+		 *    mode if one is listed.
+		 *    @param string $unmatched    Unmatched leading portion.
+		 *    @param string $matched      Actual token match.
+		 *    @param string $mode         Mode after match. A boolean
+		 *                                false mode causes no change.
+		 *    @return boolean             False if there was any error
+		 *                                from the parser.
+		 *    @access private
+		 */
+		function _dispatchTokens($unmatched, $matched, $mode = false) {
+			if (! $this->_invokeParser($unmatched, LEXER_UNMATCHED)) {
+				return false;
+			}
+			if (is_bool($mode)) {
+				return $this->_invokeParser($matched, LEXER_MATCHED);
+			}
+			if ($this->_isModeEnd($mode)) {
+				if (! $this->_invokeParser($matched, LEXER_EXIT)) {
+					return false;
+				}
+				return $this->_mode->leave();
+			}
+			if ($this->_isSpecialMode($mode)) {
+				$this->_mode->enter($this->_decodeSpecial($mode));
+				if (! $this->_invokeParser($matched, LEXER_SPECIAL)) {
+					return false;
+				}
+				return $this->_mode->leave();
+			}
+			$this->_mode->enter($mode);
+			return $this->_invokeParser($matched, LEXER_ENTER);
+		}
+
+		/**
+		 *    Tests to see if the new mode is actually to leave
+		 *    the current mode and pop an item from the matching
+		 *    mode stack.
+		 *    @param string $mode    Mode to test.
+		 *    @return boolean        True if this is the exit mode.
+		 *    @access private
+		 */
+		function _isModeEnd($mode) {
+			return ($mode === "__exit");
+		}
+
+		/**
+		 *    Test to see if the mode is one where this mode
+		 *    is entered for this token only and automatically
+		 *    leaves immediately afterwoods.
+		 *    @param string $mode    Mode to test.
+		 *    @return boolean        True if this is the exit mode.
+		 *    @access private
+		 */
+		function _isSpecialMode($mode) {
+			return (strncmp($mode, "_", 1) == 0);
+		}
+
+		/**
+		 *    Strips the magic underscore marking single token
+		 *    modes.
+		 *    @param string $mode    Mode to decode.
+		 *    @return string         Underlying mode name.
+		 *    @access private
+		 */
+		function _decodeSpecial($mode) {
+			return substr($mode, 1);
+		}
+
+		/**
+		 *    Calls the parser method named after the current
+		 *    mode. Empty content will be ignored. The lexer
+		 *    has a parser handler for each mode in the lexer.
+		 *    @param string $content        Text parsed.
+		 *    @param boolean $is_match      Token is recognised rather
+		 *                                  than unparsed data.
+		 *    @access private
+		 */
+		function _invokeParser($content, $is_match) {
+			if (($content === '') || ($content === false)) {
+				return true;
+			}
+			$handler = $this->_mode_handlers[$this->_mode->getCurrent()];
+			return $this->_parser->$handler($content, $is_match);
+		}
+
+		/**
+		 *    Tries to match a chunk of text and if successful
+		 *    removes the recognised chunk and any leading
+		 *    unparsed data. Empty strings will not be matched.
+		 *    @param string $raw         The subject to parse. This is the
+		 *                               content that will be eaten.
+		 *    @return array/boolean      Three item list of unparsed
+		 *                               content followed by the
+		 *                               recognised token and finally the
+		 *                               action the parser is to take.
+		 *                               True if no match, false if there
+		 *                               is a parsing error.
+		 *    @access private
+		 */
+		function _reduce($raw) {
+			if ($action = $this->_regexes[$this->_mode->getCurrent()]->match($raw, $match)) {
+				$unparsed_character_count = strpos($raw, $match);
+				$unparsed = substr($raw, 0, $unparsed_character_count);
+				$raw = substr($raw, $unparsed_character_count + strlen($match));
+				return array($raw, $unparsed, $match, $action);
+			}
+			return true;
+		}
+	}
+
+	/**
+	 *    Breas HTML into SAX events.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleHtmlLexer extends SimpleLexer {
-
-        /**
-         *    Sets up the lexer with case insensitive matching
-         *    and adds the HTML handlers.
-         *    @param SimpleSaxParser $parser  Handling strategy by
-         *                                    reference.
-         *    @access public
-         */
-        function SimpleHtmlLexer($parser) {
-            $this->SimpleLexer($parser, 'text');
-            $this->mapHandler('text', 'acceptTextToken');
-            $this->_addSkipping();
-            foreach ($this->_getParsedTags() as $tag) {
-                $this->_addTag($tag);
-            }
-            $this->_addInTagTokens();
-        }
-
-        /**
-         *    List of parsed tags. Others are ignored.
-         *    @return array        List of searched for tags.
-         *    @access private
-         */
-        function _getParsedTags() {
-            return array('a', 'title', 'form', 'input', 'button', 'textarea', 'select',
-                    'option', 'frameset', 'frame', 'label');
-        }
-
-        /**
-         *    The lexer has to skip certain sections such
-         *    as server code, client code and styles.
-         *    @access private
-         */
-        function _addSkipping() {
-            $this->mapHandler('css', 'ignore');
-            $this->addEntryPattern('<style', 'text', 'css');
-            $this->addExitPattern('</style>', 'css');
-            $this->mapHandler('js', 'ignore');
-            $this->addEntryPattern('<script', 'text', 'js');
-            $this->addExitPattern('</script>', 'js');
-            $this->mapHandler('comment', 'ignore');
-            $this->addEntryPattern('<!--', 'text', 'comment');
-            $this->addExitPattern('-->', 'comment');
-        }
-
-        /**
-         *    Pattern matches to start and end a tag.
-         *    @param string $tag          Name of tag to scan for.
-         *    @access private
-         */
-        function _addTag($tag) {
-            $this->addSpecialPattern("</$tag>", 'text', 'acceptEndToken');
-            $this->addEntryPattern("<$tag", 'text', 'tag');
-        }
-
-        /**
-         *    Pattern matches to parse the inside of a tag
-         *    including the attributes and their quoting.
-         *    @access private
-         */
-        function _addInTagTokens() {
-            $this->mapHandler('tag', 'acceptStartToken');
-            $this->addSpecialPattern('\s+', 'tag', 'ignore');
-            $this->_addAttributeTokens();
-            $this->addExitPattern('/>', 'tag');
-            $this->addExitPattern('>', 'tag');
-        }
-
-        /**
-         *    Matches attributes that are either single quoted,
-         *    double quoted or unquoted.
-         *    @access private
-         */
-        function _addAttributeTokens() {
-            $this->mapHandler('dq_attribute', 'acceptAttributeToken');
-            $this->addEntryPattern('=\s*"', 'tag', 'dq_attribute');
-            $this->addPattern("\\\\\"", 'dq_attribute');
-            $this->addExitPattern('"', 'dq_attribute');
-            $this->mapHandler('sq_attribute', 'acceptAttributeToken');
-            $this->addEntryPattern("=\s*'", 'tag', 'sq_attribute');
-            $this->addPattern("\\\\'", 'sq_attribute');
-            $this->addExitPattern("'", 'sq_attribute');
-            $this->mapHandler('uq_attribute', 'acceptAttributeToken');
-            $this->addSpecialPattern('=\s*[^>\s]*', 'tag', 'uq_attribute');
-        }
-    }
-
-    /**
-     *    Converts HTML tokens into selected SAX events.
+	 */
+	class SimpleHtmlLexer extends SimpleLexer {
+
+		/**
+		 *    Sets up the lexer with case insensitive matching
+		 *    and adds the HTML handlers.
+		 *    @param SimpleSaxParser $parser  Handling strategy by
+		 *                                    reference.
+		 *    @access public
+		 */
+		function SimpleHtmlLexer($parser) {
+			$this->SimpleLexer($parser, 'text');
+			$this->mapHandler('text', 'acceptTextToken');
+			$this->_addSkipping();
+			foreach ($this->_getParsedTags() as $tag) {
+				$this->_addTag($tag);
+			}
+			$this->_addInTagTokens();
+		}
+
+		/**
+		 *    List of parsed tags. Others are ignored.
+		 *    @return array        List of searched for tags.
+		 *    @access private
+		 */
+		function _getParsedTags() {
+			return array('a', 'title', 'form', 'input', 'button', 'textarea', 'select',
+					'option', 'frameset', 'frame', 'label');
+		}
+
+		/**
+		 *    The lexer has to skip certain sections such
+		 *    as server code, client code and styles.
+		 *    @access private
+		 */
+		function _addSkipping() {
+			$this->mapHandler('css', 'ignore');
+			$this->addEntryPattern('<style', 'text', 'css');
+			$this->addExitPattern('</style>', 'css');
+			$this->mapHandler('js', 'ignore');
+			$this->addEntryPattern('<script', 'text', 'js');
+			$this->addExitPattern('</script>', 'js');
+			$this->mapHandler('comment', 'ignore');
+			$this->addEntryPattern('<!--', 'text', 'comment');
+			$this->addExitPattern('-->', 'comment');
+		}
+
+		/**
+		 *    Pattern matches to start and end a tag.
+		 *    @param string $tag          Name of tag to scan for.
+		 *    @access private
+		 */
+		function _addTag($tag) {
+			$this->addSpecialPattern("</$tag>", 'text', 'acceptEndToken');
+			$this->addEntryPattern("<$tag", 'text', 'tag');
+		}
+
+		/**
+		 *    Pattern matches to parse the inside of a tag
+		 *    including the attributes and their quoting.
+		 *    @access private
+		 */
+		function _addInTagTokens() {
+			$this->mapHandler('tag', 'acceptStartToken');
+			$this->addSpecialPattern('\s+', 'tag', 'ignore');
+			$this->_addAttributeTokens();
+			$this->addExitPattern('/>', 'tag');
+			$this->addExitPattern('>', 'tag');
+		}
+
+		/**
+		 *    Matches attributes that are either single quoted,
+		 *    double quoted or unquoted.
+		 *    @access private
+		 */
+		function _addAttributeTokens() {
+			$this->mapHandler('dq_attribute', 'acceptAttributeToken');
+			$this->addEntryPattern('=\s*"', 'tag', 'dq_attribute');
+			$this->addPattern("\\\\\"", 'dq_attribute');
+			$this->addExitPattern('"', 'dq_attribute');
+			$this->mapHandler('sq_attribute', 'acceptAttributeToken');
+			$this->addEntryPattern("=\s*'", 'tag', 'sq_attribute');
+			$this->addPattern("\\\\'", 'sq_attribute');
+			$this->addExitPattern("'", 'sq_attribute');
+			$this->mapHandler('uq_attribute', 'acceptAttributeToken');
+			$this->addSpecialPattern('=\s*[^>\s]*', 'tag', 'uq_attribute');
+		}
+	}
+
+	/**
+	 *    Converts HTML tokens into selected SAX events.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleHtmlSaxParser {
-        protected $_lexer;
-        protected $_listener;
-        protected $_tag;
-        protected $_attributes;
-        protected $_current_attribute;
-
-        /**
-         *    Sets the listener.
-         *    @param SimpleSaxListener $listener    SAX event handler.
-         *    @access public
-         */
-        function SimpleHtmlSaxParser($listener) {
-            $this->_listener = $listener;
-            $this->_lexer = $this->createLexer($this);
-            $this->_tag = '';
-            $this->_attributes = array();
-            $this->_current_attribute = '';
-        }
-
-        /**
-         *    Runs the content through the lexer which
-         *    should call back to the acceptors.
-         *    @param string $raw      Page text to parse.
-         *    @return boolean         False if parse error.
-         *    @access public
-         */
-        function parse($raw) {
-            return $this->_lexer->parse($raw);
-        }
-
-        /**
-         *    Sets up the matching lexer. Starts in 'text' mode.
-         *    @param SimpleSaxParser $parser    Event generator, usually $self.
-         *    @return SimpleLexer               Lexer suitable for this parser.
-         *    @access public
-         *    @static
-         */
-        static function &createLexer($parser) {
-            $lexer = new SimpleHtmlLexer($parser);
-            return $lexer;
-        }
-
-        /**
-         *    Accepts a token from the tag mode. If the
-         *    starting element completes then the element
-         *    is dispatched and the current attributes
-         *    set back to empty. The element or attribute
-         *    name is converted to lower case.
-         *    @param string $token     Incoming characters.
-         *    @param integer $event    Lexer event type.
-         *    @return boolean          False if parse error.
-         *    @access public
-         */
-        function acceptStartToken($token, $event) {
-            if ($event == LEXER_ENTER) {
-                $this->_tag = strtolower(substr($token, 1));
-                return true;
-            }
-            if ($event == LEXER_EXIT) {
-                $success = $this->_listener->startElement(
-                        $this->_tag,
-                        $this->_attributes);
-                $this->_tag = '';
-                $this->_attributes = array();
-                return $success;
-            }
-            if ($token != '=') {
-                $this->_current_attribute = strtolower(SimpleHtmlSaxParser::decodeHtml($token));
-                $this->_attributes[$this->_current_attribute] = '';
-            }
-            return true;
-        }
-
-        /**
-         *    Accepts a token from the end tag mode.
-         *    The element name is converted to lower case.
-         *    @param string $token     Incoming characters.
-         *    @param integer $event    Lexer event type.
-         *    @return boolean          False if parse error.
-         *    @access public
-         */
-        function acceptEndToken($token, $event) {
-            if (! preg_match('/<\/(.*)>/', $token, $matches)) {
-                return false;
-            }
-            return $this->_listener->endElement(strtolower($matches[1]));
-        }
-
-        /**
-         *    Part of the tag data.
-         *    @param string $token     Incoming characters.
-         *    @param integer $event    Lexer event type.
-         *    @return boolean          False if parse error.
-         *    @access public
-         */
-        function acceptAttributeToken($token, $event) {
-            if ($event == LEXER_UNMATCHED) {
-                $this->_attributes[$this->_current_attribute] .=
-                        SimpleHtmlSaxParser::decodeHtml($token);
-            }
-            if ($event == LEXER_SPECIAL) {
-                $this->_attributes[$this->_current_attribute] .=
-                        preg_replace('/^=\s*/' , '', SimpleHtmlSaxParser::decodeHtml($token));
-            }
-            return true;
-        }
-
-        /**
-         *    A character entity.
-         *    @param string $token    Incoming characters.
-         *    @param integer $event   Lexer event type.
-         *    @return boolean         False if parse error.
-         *    @access public
-         */
-        function acceptEntityToken($token, $event) {
-        }
-
-        /**
-         *    Character data between tags regarded as
-         *    important.
-         *    @param string $token     Incoming characters.
-         *    @param integer $event    Lexer event type.
-         *    @return boolean          False if parse error.
-         *    @access public
-         */
-        function acceptTextToken($token, $event) {
-            return $this->_listener->addContent($token);
-        }
-
-        /**
-         *    Incoming data to be ignored.
-         *    @param string $token     Incoming characters.
-         *    @param integer $event    Lexer event type.
-         *    @return boolean          False if parse error.
-         *    @access public
-         */
-        function ignore($token, $event) {
-            return true;
-        }
-
-        /**
-         *    Decodes any HTML entities.
-         *    @param string $html    Incoming HTML.
-         *    @return string         Outgoing plain text.
-         *    @access public
-         *    @static
-         */
-        static function decodeHtml($html) {
-            static $translations;
-            if (! isset($translations)) {
-                $translations = array_flip(get_html_translation_table(HTML_ENTITIES));
-            }
-            return strtr($html, $translations);
-        }
-
-        /**
-         *    Turns HTML into text browser visible text. Images
-         *    are converted to their alt text and tags are supressed.
-         *    Entities are converted to their visible representation.
-         *    @param string $html        HTML to convert.
-         *    @return string             Plain text.
-         *    @access public
-         *    @static
-         */
-        static function normalise($html) {
-            $text = preg_replace('|<!--.*?-->|', '', $html);
-            $text = preg_replace('|<img.*?alt\s*=\s*"(.*?)".*?>|', ' \1 ', $text);
-            $text = preg_replace('|<img.*?alt\s*=\s*\'(.*?)\'.*?>|', ' \1 ', $text);
-            $text = preg_replace('|<img.*?alt\s*=\s*([a-zA-Z_]+).*?>|', ' \1 ', $text);
-            $text = preg_replace('|<.*?>|', '', $text);
-            $text = SimpleHtmlSaxParser::decodeHtml($text);
-            $text = preg_replace('|\s+|', ' ', $text);
-            return trim($text);
-        }
-    }
-
-    /**
-     *    SAX event handler.
+	 */
+	class SimpleHtmlSaxParser {
+		protected $_lexer;
+		protected $_listener;
+		protected $_tag;
+		protected $_attributes;
+		protected $_current_attribute;
+
+		/**
+		 *    Sets the listener.
+		 *    @param SimpleSaxListener $listener    SAX event handler.
+		 *    @access public
+		 */
+		function SimpleHtmlSaxParser($listener) {
+			$this->_listener = $listener;
+			$this->_lexer = $this->createLexer($this);
+			$this->_tag = '';
+			$this->_attributes = array();
+			$this->_current_attribute = '';
+		}
+
+		/**
+		 *    Runs the content through the lexer which
+		 *    should call back to the acceptors.
+		 *    @param string $raw      Page text to parse.
+		 *    @return boolean         False if parse error.
+		 *    @access public
+		 */
+		function parse($raw) {
+			return $this->_lexer->parse($raw);
+		}
+
+		/**
+		 *    Sets up the matching lexer. Starts in 'text' mode.
+		 *    @param SimpleSaxParser $parser    Event generator, usually $self.
+		 *    @return SimpleLexer               Lexer suitable for this parser.
+		 *    @access public
+		 *    @static
+		 */
+		static function &createLexer($parser) {
+			$lexer = new SimpleHtmlLexer($parser);
+			return $lexer;
+		}
+
+		/**
+		 *    Accepts a token from the tag mode. If the
+		 *    starting element completes then the element
+		 *    is dispatched and the current attributes
+		 *    set back to empty. The element or attribute
+		 *    name is converted to lower case.
+		 *    @param string $token     Incoming characters.
+		 *    @param integer $event    Lexer event type.
+		 *    @return boolean          False if parse error.
+		 *    @access public
+		 */
+		function acceptStartToken($token, $event) {
+			if ($event == LEXER_ENTER) {
+				$this->_tag = strtolower(substr($token, 1));
+				return true;
+			}
+			if ($event == LEXER_EXIT) {
+				$success = $this->_listener->startElement(
+						$this->_tag,
+						$this->_attributes);
+				$this->_tag = '';
+				$this->_attributes = array();
+				return $success;
+			}
+			if ($token != '=') {
+				$this->_current_attribute = strtolower(SimpleHtmlSaxParser::decodeHtml($token));
+				$this->_attributes[$this->_current_attribute] = '';
+			}
+			return true;
+		}
+
+		/**
+		 *    Accepts a token from the end tag mode.
+		 *    The element name is converted to lower case.
+		 *    @param string $token     Incoming characters.
+		 *    @param integer $event    Lexer event type.
+		 *    @return boolean          False if parse error.
+		 *    @access public
+		 */
+		function acceptEndToken($token, $event) {
+			if (! preg_match('/<\/(.*)>/', $token, $matches)) {
+				return false;
+			}
+			return $this->_listener->endElement(strtolower($matches[1]));
+		}
+
+		/**
+		 *    Part of the tag data.
+		 *    @param string $token     Incoming characters.
+		 *    @param integer $event    Lexer event type.
+		 *    @return boolean          False if parse error.
+		 *    @access public
+		 */
+		function acceptAttributeToken($token, $event) {
+			if ($event == LEXER_UNMATCHED) {
+				$this->_attributes[$this->_current_attribute] .=
+						SimpleHtmlSaxParser::decodeHtml($token);
+			}
+			if ($event == LEXER_SPECIAL) {
+				$this->_attributes[$this->_current_attribute] .=
+						preg_replace('/^=\s*/' , '', SimpleHtmlSaxParser::decodeHtml($token));
+			}
+			return true;
+		}
+
+		/**
+		 *    A character entity.
+		 *    @param string $token    Incoming characters.
+		 *    @param integer $event   Lexer event type.
+		 *    @return boolean         False if parse error.
+		 *    @access public
+		 */
+		function acceptEntityToken($token, $event) {
+		}
+
+		/**
+		 *    Character data between tags regarded as
+		 *    important.
+		 *    @param string $token     Incoming characters.
+		 *    @param integer $event    Lexer event type.
+		 *    @return boolean          False if parse error.
+		 *    @access public
+		 */
+		function acceptTextToken($token, $event) {
+			return $this->_listener->addContent($token);
+		}
+
+		/**
+		 *    Incoming data to be ignored.
+		 *    @param string $token     Incoming characters.
+		 *    @param integer $event    Lexer event type.
+		 *    @return boolean          False if parse error.
+		 *    @access public
+		 */
+		function ignore($token, $event) {
+			return true;
+		}
+
+		/**
+		 *    Decodes any HTML entities.
+		 *    @param string $html    Incoming HTML.
+		 *    @return string         Outgoing plain text.
+		 *    @access public
+		 *    @static
+		 */
+		static function decodeHtml($html) {
+			static $translations;
+			if (! isset($translations)) {
+				$translations = array_flip(get_html_translation_table(HTML_ENTITIES));
+			}
+			return strtr($html, $translations);
+		}
+
+		/**
+		 *    Turns HTML into text browser visible text. Images
+		 *    are converted to their alt text and tags are supressed.
+		 *    Entities are converted to their visible representation.
+		 *    @param string $html        HTML to convert.
+		 *    @return string             Plain text.
+		 *    @access public
+		 *    @static
+		 */
+		static function normalise($html) {
+			$text = preg_replace('|<!--.*?-->|', '', $html);
+			$text = preg_replace('|<img.*?alt\s*=\s*"(.*?)".*?>|', ' \1 ', $text);
+			$text = preg_replace('|<img.*?alt\s*=\s*\'(.*?)\'.*?>|', ' \1 ', $text);
+			$text = preg_replace('|<img.*?alt\s*=\s*([a-zA-Z_]+).*?>|', ' \1 ', $text);
+			$text = preg_replace('|<.*?>|', '', $text);
+			$text = SimpleHtmlSaxParser::decodeHtml($text);
+			$text = preg_replace('|\s+|', ' ', $text);
+			return trim($text);
+		}
+	}
+
+	/**
+	 *    SAX event handler.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     *    @abstract
-     */
-    class SimpleSaxListener {
-
-        /**
-         *    Sets the document to write to.
-         *    @access public
-         */
-        function SimpleSaxListener() {
-        }
-
-        /**
-         *    Start of element event.
-         *    @param string $name        Element name.
-         *    @param hash $attributes    Name value pairs.
-         *                               Attributes without content
-         *                               are marked as true.
-         *    @return boolean            False on parse error.
-         *    @access public
-         */
-        function startElement($name, $attributes) {
-        }
-
-        /**
-         *    End of element event.
-         *    @param string $name        Element name.
-         *    @return boolean            False on parse error.
-         *    @access public
-         */
-        function endElement($name) {
-        }
-
-        /**
-         *    Unparsed, but relevant data.
-         *    @param string $text        May include unparsed tags.
-         *    @return boolean            False on parse error.
-         *    @access public
-         */
-        function addContent($text) {
-        }
-    }
\ No newline at end of file
+	 *    @abstract
+	 */
+	class SimpleSaxListener {
+
+		/**
+		 *    Sets the document to write to.
+		 *    @access public
+		 */
+		function SimpleSaxListener() {
+		}
+
+		/**
+		 *    Start of element event.
+		 *    @param string $name        Element name.
+		 *    @param hash $attributes    Name value pairs.
+		 *                               Attributes without content
+		 *                               are marked as true.
+		 *    @return boolean            False on parse error.
+		 *    @access public
+		 */
+		function startElement($name, $attributes) {
+		}
+
+		/**
+		 *    End of element event.
+		 *    @param string $name        Element name.
+		 *    @return boolean            False on parse error.
+		 *    @access public
+		 */
+		function endElement($name) {
+		}
+
+		/**
+		 *    Unparsed, but relevant data.
+		 *    @param string $text        May include unparsed tags.
+		 *    @return boolean            False on parse error.
+		 *    @access public
+		 */
+		function addContent($text) {
+		}
+	}
\ No newline at end of file

Spacing +23 added lines, -23 removed lines

@@ -9,19 +9,19 @@ 
     /**#@+
      * Lexer mode stack constants
      */
-    if (! defined('LEXER_ENTER')) {
+    if (!defined('LEXER_ENTER')) {
         define('LEXER_ENTER', 1);
     }
-    if (! defined('LEXER_MATCHED')) {
+    if (!defined('LEXER_MATCHED')) {
         define('LEXER_MATCHED', 2);
     }
-    if (! defined('LEXER_UNMATCHED')) {
+    if (!defined('LEXER_UNMATCHED')) {
         define('LEXER_UNMATCHED', 3);
     }
-    if (! defined('LEXER_EXIT')) {
+    if (!defined('LEXER_EXIT')) {
         define('LEXER_EXIT', 4);
     }
-    if (! defined('LEXER_SPECIAL')) {
+    if (!defined('LEXER_SPECIAL')) {
         define('LEXER_SPECIAL', 5);
     }
     /**#@-*/
@@ -80,7 +80,7 @@ 
             if (count($this->_patterns) == 0) {
                 return false;
             }
-            if (! preg_match($this->_getCompoundedRegex(), $subject, $matches)) {
+            if (!preg_match($this->_getCompoundedRegex(), $subject, $matches)) {
                 $match = '';
                 return false;
             }
@@ -221,11 +221,11 @@ 
          *    @access public
          */
         function addPattern($pattern, $mode = "accept") {
-            if (! isset($this->_regexes[$mode])) {
+            if (!isset($this->_regexes[$mode])) {
                 $this->_regexes[$mode] = new ParallelRegex($this->_case);
             }
             $this->_regexes[$mode]->addPattern($pattern);
-            if (! isset($this->_mode_handlers[$mode])) {
+            if (!isset($this->_mode_handlers[$mode])) {
                 $this->_mode_handlers[$mode] = $mode;
             }
         }
@@ -244,11 +244,11 @@ 
          *    @access public
          */
         function addEntryPattern($pattern, $mode, $new_mode) {
-            if (! isset($this->_regexes[$mode])) {
+            if (!isset($this->_regexes[$mode])) {
                 $this->_regexes[$mode] = new ParallelRegex($this->_case);
             }
             $this->_regexes[$mode]->addPattern($pattern, $new_mode);
-            if (! isset($this->_mode_handlers[$new_mode])) {
+            if (!isset($this->_mode_handlers[$new_mode])) {
                 $this->_mode_handlers[$new_mode] = $new_mode;
             }
         }
@@ -262,11 +262,11 @@ 
          *    @access public
          */
         function addExitPattern($pattern, $mode) {
-            if (! isset($this->_regexes[$mode])) {
+            if (!isset($this->_regexes[$mode])) {
                 $this->_regexes[$mode] = new ParallelRegex($this->_case);
             }
             $this->_regexes[$mode]->addPattern($pattern, "__exit");
-            if (! isset($this->_mode_handlers[$mode])) {
+            if (!isset($this->_mode_handlers[$mode])) {
                 $this->_mode_handlers[$mode] = $mode;
             }
         }
@@ -284,11 +284,11 @@ 
          *    @access public
          */
         function addSpecialPattern($pattern, $mode, $special) {
-            if (! isset($this->_regexes[$mode])) {
+            if (!isset($this->_regexes[$mode])) {
                 $this->_regexes[$mode] = new ParallelRegex($this->_case);
             }
             $this->_regexes[$mode]->addPattern($pattern, "_$special");
-            if (! isset($this->_mode_handlers[$special])) {
+            if (!isset($this->_mode_handlers[$special])) {
                 $this->_mode_handlers[$special] = $special;
             }
         }
@@ -314,13 +314,13 @@ 
          *    @access public
          */
         function parse($raw) {
-            if (! isset($this->_parser)) {
+            if (!isset($this->_parser)) {
                 return false;
             }
             $length = strlen($raw);
             while (is_array($parsed = $this->_reduce($raw))) {
                 list($raw, $unmatched, $matched, $mode) = $parsed;
-                if (! $this->_dispatchTokens($unmatched, $matched, $mode)) {
+                if (!$this->_dispatchTokens($unmatched, $matched, $mode)) {
                     return false;
                 }
                 if ($raw === '') {
@@ -331,7 +331,7 @@ 
                 }
                 $length = strlen($raw);
             }
-            if (! $parsed) {
+            if (!$parsed) {
                 return false;
             }
             return $this->_invokeParser($raw, LEXER_UNMATCHED);
@@ -350,21 +350,21 @@ 
          *    @access private
          */
         function _dispatchTokens($unmatched, $matched, $mode = false) {
-            if (! $this->_invokeParser($unmatched, LEXER_UNMATCHED)) {
+            if (!$this->_invokeParser($unmatched, LEXER_UNMATCHED)) {
                 return false;
             }
             if (is_bool($mode)) {
                 return $this->_invokeParser($matched, LEXER_MATCHED);
             }
             if ($this->_isModeEnd($mode)) {
-                if (! $this->_invokeParser($matched, LEXER_EXIT)) {
+                if (!$this->_invokeParser($matched, LEXER_EXIT)) {
                     return false;
                 }
                 return $this->_mode->leave();
             }
             if ($this->_isSpecialMode($mode)) {
                 $this->_mode->enter($this->_decodeSpecial($mode));
-                if (! $this->_invokeParser($matched, LEXER_SPECIAL)) {
+                if (!$this->_invokeParser($matched, LEXER_SPECIAL)) {
                     return false;
                 }
                 return $this->_mode->leave();
@@ -631,7 +631,7 @@ 
          *    @access public
          */
         function acceptEndToken($token, $event) {
-            if (! preg_match('/<\/(.*)>/', $token, $matches)) {
+            if (!preg_match('/<\/(.*)>/', $token, $matches)) {
                 return false;
             }
             return $this->_listener->endElement(strtolower($matches[1]));
@@ -651,7 +651,7 @@ 
             }
             if ($event == LEXER_SPECIAL) {
                 $this->_attributes[$this->_current_attribute] .=
-                        preg_replace('/^=\s*/' , '', SimpleHtmlSaxParser::decodeHtml($token));
+                        preg_replace('/^=\s*/', '', SimpleHtmlSaxParser::decodeHtml($token));
             }
             return true;
         }
@@ -698,7 +698,7 @@ 
          */
         static function decodeHtml($html) {
             static $translations;
-            if (! isset($translations)) {
+            if (!isset($translations)) {
                 $translations = array_flip(get_html_translation_table(HTML_ENTITIES));
             }
             return strtr($html, $translations);

tests/test_tools/simpletest/reflection_php4.php

Doc Comments +1 added lines

@@ -87,6 +87,7 @@
          *    Finds the parent class name.
          *    @returns string      Parent class name.
          *    @access public
+         * @return string
          */
         function getParent() {
             return strtolower(get_parent_class($this->_interface));

Indentation +100 added lines, -100 removed lines

@@ -1,114 +1,114 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	UnitTester
-     *	@version	$Id: reflection_php4.php 1398 2006-09-08 19:31:03Z xue $
-     */
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	UnitTester
+	 *	@version	$Id: reflection_php4.php 1398 2006-09-08 19:31:03Z xue $
+	 */
 
-    /**
-     *    Version specific reflection API.
+	/**
+	 *    Version specific reflection API.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class SimpleReflection {
-        protected $_interface;
+	 */
+	class SimpleReflection {
+		protected $_interface;
 
-        /**
-         *    Stashes the class/interface.
-         *    @param string $interface    Class or interface
-         *                                to inspect.
-         */
-        function SimpleReflection($interface) {
-            $this->_interface = $interface;
-        }
+		/**
+		 *    Stashes the class/interface.
+		 *    @param string $interface    Class or interface
+		 *                                to inspect.
+		 */
+		function SimpleReflection($interface) {
+			$this->_interface = $interface;
+		}
 
-        /**
-         *    Checks that a class has been declared.
-         *    @return boolean        True if defined.
-         *    @access public
-         */
-        function classExists() {
-            return class_exists($this->_interface);
-        }
+		/**
+		 *    Checks that a class has been declared.
+		 *    @return boolean        True if defined.
+		 *    @access public
+		 */
+		function classExists() {
+			return class_exists($this->_interface);
+		}
 
-        /**
-         *    Needed to kill the autoload feature in PHP5
-         *    for classes created dynamically.
-         *    @return boolean        True if defined.
-         *    @access public
-         */
-        function classExistsSansAutoload() {
-            return class_exists($this->_interface);
-        }
+		/**
+		 *    Needed to kill the autoload feature in PHP5
+		 *    for classes created dynamically.
+		 *    @return boolean        True if defined.
+		 *    @access public
+		 */
+		function classExistsSansAutoload() {
+			return class_exists($this->_interface);
+		}
 
-        /**
-         *    Checks that a class or interface has been
-         *    declared.
-         *    @return boolean        True if defined.
-         *    @access public
-         */
-        function classOrInterfaceExists() {
-            return class_exists($this->_interface);
-        }
+		/**
+		 *    Checks that a class or interface has been
+		 *    declared.
+		 *    @return boolean        True if defined.
+		 *    @access public
+		 */
+		function classOrInterfaceExists() {
+			return class_exists($this->_interface);
+		}
 
-        /**
-         *    Needed to kill the autoload feature in PHP5
-         *    for classes created dynamically.
-         *    @return boolean        True if defined.
-         *    @access public
-         */
-        function classOrInterfaceExistsSansAutoload() {
-            return class_exists($this->_interface);
-        }
+		/**
+		 *    Needed to kill the autoload feature in PHP5
+		 *    for classes created dynamically.
+		 *    @return boolean        True if defined.
+		 *    @access public
+		 */
+		function classOrInterfaceExistsSansAutoload() {
+			return class_exists($this->_interface);
+		}
 
-        /**
-         *    Gets the list of methods on a class or
-         *    interface.
-         *    @returns array          List of method names.
-         *    @access public
-         */
-        function getMethods() {
-            return get_class_methods($this->_interface);
-        }
+		/**
+		 *    Gets the list of methods on a class or
+		 *    interface.
+		 *    @returns array          List of method names.
+		 *    @access public
+		 */
+		function getMethods() {
+			return get_class_methods($this->_interface);
+		}
 
-        /**
-         *    Gets the list of interfaces from a class. If the
-         *	  class name is actually an interface then just that
-         *	  interface is returned.
-         *    @returns array          List of interfaces.
-         *    @access public
-         */
-        function getInterfaces() {
-            return array();
-        }
+		/**
+		 *    Gets the list of interfaces from a class. If the
+		 *	  class name is actually an interface then just that
+		 *	  interface is returned.
+		 *    @returns array          List of interfaces.
+		 *    @access public
+		 */
+		function getInterfaces() {
+			return array();
+		}
 
-        /**
-         *    Finds the parent class name.
-         *    @returns string      Parent class name.
-         *    @access public
-         */
-        function getParent() {
-            return strtolower(get_parent_class($this->_interface));
-        }
+		/**
+		 *    Finds the parent class name.
+		 *    @returns string      Parent class name.
+		 *    @access public
+		 */
+		function getParent() {
+			return strtolower(get_parent_class($this->_interface));
+		}
 
-        /**
-         *    Determines if the class is abstract, which for PHP 4
-         *    will never be the case.
-         *    @returns boolean      True if abstract.
-         *    @access public
-         */
-        function isAbstract() {
-            return false;
-        }
+		/**
+		 *    Determines if the class is abstract, which for PHP 4
+		 *    will never be the case.
+		 *    @returns boolean      True if abstract.
+		 *    @access public
+		 */
+		function isAbstract() {
+			return false;
+		}
 
-        /**
-         *	  Gets the source code matching the declaration
-         *	  of a method.
-         * 	  @param string $method		  Method name.
-         *    @access public
-         */
-        function getSignature($method) {
-        	return "function $method()";
-        }
-    }
\ No newline at end of file
+		/**
+		 *	  Gets the source code matching the declaration
+		 *	  of a method.
+		 * 	  @param string $method		  Method name.
+		 *    @access public
+		 */
+		function getSignature($method) {
+			return "function $method()";
+		}
+	}
\ No newline at end of file

tests/test_tools/simpletest/remote.php

Doc Comments +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
         /**
          *    Creates the XML parser.
          *    @param SimpleReporter $reporter    Target of test results.
-         *    @return SimpleTestXmlListener      XML reader.
+         *    @return SimpleTestXmlParser      XML reader.
          *    @access protected
          */
         function &_createParser($reporter) {

Indentation +101 added lines, -101 removed lines

@@ -1,114 +1,114 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	UnitTester
-     *	@version	$Id: remote.php 1398 2006-09-08 19:31:03Z xue $
-     */
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	UnitTester
+	 *	@version	$Id: remote.php 1398 2006-09-08 19:31:03Z xue $
+	 */
 
-    /**#@+
+	/**#@+
      *	include other SimpleTest class files
      */
-    require_once(dirname(__FILE__) . '/browser.php');
-    require_once(dirname(__FILE__) . '/xml.php');
-    require_once(dirname(__FILE__) . '/test_case.php');
-    /**#@-*/
+	require_once(dirname(__FILE__) . '/browser.php');
+	require_once(dirname(__FILE__) . '/xml.php');
+	require_once(dirname(__FILE__) . '/test_case.php');
+	/**#@-*/
 
-    /**
-     *    Runs an XML formated test on a remote server.
+	/**
+	 *    Runs an XML formated test on a remote server.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class RemoteTestCase {
-        protected $_url;
-        protected $_dry_url;
-        protected $_size;
+	 */
+	class RemoteTestCase {
+		protected $_url;
+		protected $_dry_url;
+		protected $_size;
 
-        /**
-         *    Sets the location of the remote test.
-         *    @param string $url       Test location.
-         *    @param string $dry_url   Location for dry run.
-         *    @access public
-         */
-        function RemoteTestCase($url, $dry_url = false) {
-            $this->_url = $url;
-            $this->_dry_url = $dry_url ? $dry_url : $url;
-            $this->_size = false;
-        }
+		/**
+		 *    Sets the location of the remote test.
+		 *    @param string $url       Test location.
+		 *    @param string $dry_url   Location for dry run.
+		 *    @access public
+		 */
+		function RemoteTestCase($url, $dry_url = false) {
+			$this->_url = $url;
+			$this->_dry_url = $dry_url ? $dry_url : $url;
+			$this->_size = false;
+		}
 
-        /**
-         *    Accessor for the test name for subclasses.
-         *    @return string           Name of the test.
-         *    @access public
-         */
-        function getLabel() {
-            return $this->_url;
-        }
+		/**
+		 *    Accessor for the test name for subclasses.
+		 *    @return string           Name of the test.
+		 *    @access public
+		 */
+		function getLabel() {
+			return $this->_url;
+		}
 
-        /**
-         *    Runs the top level test for this class. Currently
-         *    reads the data as a single chunk. I'll fix this
-         *    once I have added iteration to the browser.
-         *    @param SimpleReporter $reporter    Target of test results.
-         *    @returns boolean                   True if no failures.
-         *    @access public
-         */
-        function run($reporter) {
-            $browser = $this->_createBrowser();
-            $xml = $browser->get($this->_url);
-            if (! $xml) {
-                trigger_error('Cannot read remote test URL [' . $this->_url . ']');
-                return false;
-            }
-            $parser = $this->_createParser($reporter);
-            if (! $parser->parse($xml)) {
-                trigger_error('Cannot parse incoming XML from [' . $this->_url . ']');
-                return false;
-            }
-            return true;
-        }
+		/**
+		 *    Runs the top level test for this class. Currently
+		 *    reads the data as a single chunk. I'll fix this
+		 *    once I have added iteration to the browser.
+		 *    @param SimpleReporter $reporter    Target of test results.
+		 *    @returns boolean                   True if no failures.
+		 *    @access public
+		 */
+		function run($reporter) {
+			$browser = $this->_createBrowser();
+			$xml = $browser->get($this->_url);
+			if (! $xml) {
+				trigger_error('Cannot read remote test URL [' . $this->_url . ']');
+				return false;
+			}
+			$parser = $this->_createParser($reporter);
+			if (! $parser->parse($xml)) {
+				trigger_error('Cannot parse incoming XML from [' . $this->_url . ']');
+				return false;
+			}
+			return true;
+		}
 
-        /**
-         *    Creates a new web browser object for fetching
-         *    the XML report.
-         *    @return SimpleBrowser           New browser.
-         *    @access protected
-         */
-        function &_createBrowser() {
-            return new SimpleBrowser();
-        }
+		/**
+		 *    Creates a new web browser object for fetching
+		 *    the XML report.
+		 *    @return SimpleBrowser           New browser.
+		 *    @access protected
+		 */
+		function &_createBrowser() {
+			return new SimpleBrowser();
+		}
 
-        /**
-         *    Creates the XML parser.
-         *    @param SimpleReporter $reporter    Target of test results.
-         *    @return SimpleTestXmlListener      XML reader.
-         *    @access protected
-         */
-        function &_createParser($reporter) {
-            return new SimpleTestXmlParser($reporter);
-        }
+		/**
+		 *    Creates the XML parser.
+		 *    @param SimpleReporter $reporter    Target of test results.
+		 *    @return SimpleTestXmlListener      XML reader.
+		 *    @access protected
+		 */
+		function &_createParser($reporter) {
+			return new SimpleTestXmlParser($reporter);
+		}
 
-        /**
-         *    Accessor for the number of subtests.
-         *    @return integer           Number of test cases.
-         *    @access public
-         */
-        function getSize() {
-            if ($this->_size === false) {
-                $browser = $this->_createBrowser();
-                $xml = $browser->get($this->_dry_url);
-                if (! $xml) {
-                    trigger_error('Cannot read remote test URL [' . $this->_dry_url . ']');
-                    return false;
-                }
-                $reporter = new SimpleReporter();
-                $parser = $this->_createParser($reporter);
-                if (! $parser->parse($xml)) {
-                    trigger_error('Cannot parse incoming XML from [' . $this->_dry_url . ']');
-                    return false;
-                }
-                $this->_size = $reporter->getTestCaseCount();
-            }
-            return $this->_size;
-        }
-    }
\ No newline at end of file
+		/**
+		 *    Accessor for the number of subtests.
+		 *    @return integer           Number of test cases.
+		 *    @access public
+		 */
+		function getSize() {
+			if ($this->_size === false) {
+				$browser = $this->_createBrowser();
+				$xml = $browser->get($this->_dry_url);
+				if (! $xml) {
+					trigger_error('Cannot read remote test URL [' . $this->_dry_url . ']');
+					return false;
+				}
+				$reporter = new SimpleReporter();
+				$parser = $this->_createParser($reporter);
+				if (! $parser->parse($xml)) {
+					trigger_error('Cannot parse incoming XML from [' . $this->_dry_url . ']');
+					return false;
+				}
+				$this->_size = $reporter->getTestCaseCount();
+			}
+			return $this->_size;
+		}
+	}
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -56,12 +56,12 @@ 
         function run($reporter) {
             $browser = $this->_createBrowser();
             $xml = $browser->get($this->_url);
-            if (! $xml) {
+            if (!$xml) {
                 trigger_error('Cannot read remote test URL [' . $this->_url . ']');
                 return false;
             }
             $parser = $this->_createParser($reporter);
-            if (! $parser->parse($xml)) {
+            if (!$parser->parse($xml)) {
                 trigger_error('Cannot parse incoming XML from [' . $this->_url . ']');
                 return false;
             }
@@ -97,13 +97,13 @@ 
             if ($this->_size === false) {
                 $browser = $this->_createBrowser();
                 $xml = $browser->get($this->_dry_url);
-                if (! $xml) {
+                if (!$xml) {
                     trigger_error('Cannot read remote test URL [' . $this->_dry_url . ']');
                     return false;
                 }
                 $reporter = new SimpleReporter();
                 $parser = $this->_createParser($reporter);
-                if (! $parser->parse($xml)) {
+                if (!$parser->parse($xml)) {
                     trigger_error('Cannot parse incoming XML from [' . $this->_dry_url . ']');
                     return false;
                 }

tests/test_tools/simpletest/runner.php

Doc Comments +1 added lines, -4 removed lines

@@ -164,9 +164,6 @@ 
 
         /**
          *    Runs the test methods in the test case.
-         *    @param SimpleTest $test_case    Test case to run test on.
-         *    @param string $method           Name of test method.
-         *    @access public
          */
         function run() {
             $methods = get_class_methods(get_class($this->_test_case));
@@ -288,7 +285,7 @@ 
          *    Chains to the wrapped reporter.
          *    @param string $type        Event type as text.
          *    @param mixed $payload      Message or object.
-         *    @return boolean            Should return false if this
+         *    @return boolean|null            Should return false if this
          *                               type of signal should fail the
          *                               test suite.
          *    @access public

Indentation +259 added lines, -259 removed lines

@@ -1,299 +1,299 @@
 <?php
-    /**
-     *	Base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	UnitTester
-     *	@version	$Id: runner.php 1398 2006-09-08 19:31:03Z xue $
-     */
+	/**
+	 *	Base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	UnitTester
+	 *	@version	$Id: runner.php 1398 2006-09-08 19:31:03Z xue $
+	 */
 
-    /**#@+
+	/**#@+
      * Includes SimpleTest files and defined the root constant
      * for dependent libraries.
      */
-    require_once(dirname(__FILE__) . '/errors.php');
-    require_once(dirname(__FILE__) . '/options.php');
-    require_once(dirname(__FILE__) . '/scorer.php');
-    require_once(dirname(__FILE__) . '/expectation.php');
-    require_once(dirname(__FILE__) . '/dumper.php');
-    if (! defined('SIMPLE_TEST')) {
-        define('SIMPLE_TEST', dirname(__FILE__) . '/');
-    }
-    /**#@-*/
+	require_once(dirname(__FILE__) . '/errors.php');
+	require_once(dirname(__FILE__) . '/options.php');
+	require_once(dirname(__FILE__) . '/scorer.php');
+	require_once(dirname(__FILE__) . '/expectation.php');
+	require_once(dirname(__FILE__) . '/dumper.php');
+	if (! defined('SIMPLE_TEST')) {
+		define('SIMPLE_TEST', dirname(__FILE__) . '/');
+	}
+	/**#@-*/
 
-    /**
-     *    This is called by the class runner to run a
-     *    single test method. Will also run the setUp()
-     *    and tearDown() methods.
+	/**
+	 *    This is called by the class runner to run a
+	 *    single test method. Will also run the setUp()
+	 *    and tearDown() methods.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class SimpleInvoker {
-        protected $_test_case;
+	 */
+	class SimpleInvoker {
+		protected $_test_case;
 
-        /**
-         *    Stashes the test case for later.
-         *    @param SimpleTestCase $test_case  Test case to run.
-         */
-        function SimpleInvoker($test_case) {
-            $this->_test_case = $test_case;
-        }
+		/**
+		 *    Stashes the test case for later.
+		 *    @param SimpleTestCase $test_case  Test case to run.
+		 */
+		function SimpleInvoker($test_case) {
+			$this->_test_case = $test_case;
+		}
 
-        /**
-         *    Accessor for test case being run.
-         *    @return SimpleTestCase    Test case.
-         *    @access public
-         */
-        function getTestCase() {
-            return $this->_test_case;
-        }
+		/**
+		 *    Accessor for test case being run.
+		 *    @return SimpleTestCase    Test case.
+		 *    @access public
+		 */
+		function getTestCase() {
+			return $this->_test_case;
+		}
 
-        /**
-         *    Invokes a test method and buffered with setUp()
-         *    and tearDown() calls.
-         *    @param string $method    Test method to call.
-         *    @access public
-         */
-        function invoke($method) {
-            $this->_test_case->setUp();
-            $this->_test_case->$method();
-            $this->_test_case->tearDown();
-        }
-    }
+		/**
+		 *    Invokes a test method and buffered with setUp()
+		 *    and tearDown() calls.
+		 *    @param string $method    Test method to call.
+		 *    @access public
+		 */
+		function invoke($method) {
+			$this->_test_case->setUp();
+			$this->_test_case->$method();
+			$this->_test_case->tearDown();
+		}
+	}
 
-    /**
-     *    Do nothing decorator. Just passes the invocation
-     *    straight through.
+	/**
+	 *    Do nothing decorator. Just passes the invocation
+	 *    straight through.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class SimpleInvokerDecorator {
-        protected $_invoker;
+	 */
+	class SimpleInvokerDecorator {
+		protected $_invoker;
 
-        /**
-         *    Stores the invoker to wrap.
-         *    @param SimpleInvoker $invoker  Test method runner.
-         */
-        function SimpleInvokerDecorator($invoker) {
-            $this->_invoker = $invoker;
-        }
+		/**
+		 *    Stores the invoker to wrap.
+		 *    @param SimpleInvoker $invoker  Test method runner.
+		 */
+		function SimpleInvokerDecorator($invoker) {
+			$this->_invoker = $invoker;
+		}
 
-        /**
-         *    Accessor for test case being run.
-         *    @return SimpleTestCase    Test case.
-         *    @access public
-         */
-        function getTestCase() {
-            return $this->_invoker->getTestCase();
-        }
+		/**
+		 *    Accessor for test case being run.
+		 *    @return SimpleTestCase    Test case.
+		 *    @access public
+		 */
+		function getTestCase() {
+			return $this->_invoker->getTestCase();
+		}
 
-        /**
-         *    Invokes a test method and buffered with setUp()
-         *    and tearDown() calls.
-         *    @param string $method    Test method to call.
-         *    @access public
-         */
-        function invoke($method) {
-            $this->_invoker->invoke($method);
-        }
-    }
+		/**
+		 *    Invokes a test method and buffered with setUp()
+		 *    and tearDown() calls.
+		 *    @param string $method    Test method to call.
+		 *    @access public
+		 */
+		function invoke($method) {
+			$this->_invoker->invoke($method);
+		}
+	}
 
-    /**
-     *    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()) {
-                $test_case = $this->getTestCase();
-                $test_case->error($severity, $message, $file, $line, $globals);
-            }
-            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()) {
+				$test_case = $this->getTestCase();
+				$test_case->error($severity, $message, $file, $line, $globals);
+			}
+			restore_error_handler();
+		}
+	}
 
-    /**
-     *    The standard runner. Will run every method starting
-     *    with test Basically the
-     *    Mediator pattern.
+	/**
+	 *    The standard runner. Will run every method starting
+	 *    with test Basically the
+	 *    Mediator pattern.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class SimpleRunner {
-        protected $_test_case;
-        protected $_scorer;
+	 */
+	class SimpleRunner {
+		protected $_test_case;
+		protected $_scorer;
 
-        /**
-         *    Takes in the test case and reporter to mediate between.
-         *    @param SimpleTestCase $test_case  Test case to run.
-         *    @param SimpleScorer $scorer       Reporter to receive events.
-         */
-        function SimpleRunner($test_case, $scorer) {
-            $this->_test_case = $test_case;
-            $this->_scorer = $scorer;
-        }
+		/**
+		 *    Takes in the test case and reporter to mediate between.
+		 *    @param SimpleTestCase $test_case  Test case to run.
+		 *    @param SimpleScorer $scorer       Reporter to receive events.
+		 */
+		function SimpleRunner($test_case, $scorer) {
+			$this->_test_case = $test_case;
+			$this->_scorer = $scorer;
+		}
 
-        /**
-         *    Accessor for test case being run.
-         *    @return SimpleTestCase    Test case.
-         *    @access public
-         */
-        function getTestCase() {
-            return $this->_test_case;
-        }
+		/**
+		 *    Accessor for test case being run.
+		 *    @return SimpleTestCase    Test case.
+		 *    @access public
+		 */
+		function getTestCase() {
+			return $this->_test_case;
+		}
 
-        /**
-         *    Runs the test methods in the test case.
-         *    @param SimpleTest $test_case    Test case to run test on.
-         *    @param string $method           Name of test method.
-         *    @access public
-         */
-        function run() {
-            $methods = get_class_methods(get_class($this->_test_case));
-            $invoker = $this->_test_case->createInvoker();
-            foreach ($methods as $method) {
-                if (! $this->_isTest($method)) {
-                    continue;
-                }
-                if ($this->_isConstructor($method)) {
-                    continue;
-                }
-                $this->_scorer->paintMethodStart($method);
-                if ($this->_scorer->shouldInvoke($this->_test_case->getLabel(), $method)) {
-                    $invoker->invoke($method);
-                }
-                $this->_scorer->paintMethodEnd($method);
-            }
-        }
+		/**
+		 *    Runs the test methods in the test case.
+		 *    @param SimpleTest $test_case    Test case to run test on.
+		 *    @param string $method           Name of test method.
+		 *    @access public
+		 */
+		function run() {
+			$methods = get_class_methods(get_class($this->_test_case));
+			$invoker = $this->_test_case->createInvoker();
+			foreach ($methods as $method) {
+				if (! $this->_isTest($method)) {
+					continue;
+				}
+				if ($this->_isConstructor($method)) {
+					continue;
+				}
+				$this->_scorer->paintMethodStart($method);
+				if ($this->_scorer->shouldInvoke($this->_test_case->getLabel(), $method)) {
+					$invoker->invoke($method);
+				}
+				$this->_scorer->paintMethodEnd($method);
+			}
+		}
 
-        /**
-         *    Tests to see if the method is the constructor and
-         *    so should be ignored.
-         *    @param string $method        Method name to try.
-         *    @return boolean              True if constructor.
-         *    @access protected
-         */
-        function _isConstructor($method) {
-            return SimpleTestCompatibility::isA(
-                    $this->_test_case,
-                    strtolower($method));
-        }
+		/**
+		 *    Tests to see if the method is the constructor and
+		 *    so should be ignored.
+		 *    @param string $method        Method name to try.
+		 *    @return boolean              True if constructor.
+		 *    @access protected
+		 */
+		function _isConstructor($method) {
+			return SimpleTestCompatibility::isA(
+					$this->_test_case,
+					strtolower($method));
+		}
 
-        /**
-         *    Tests to see if the method is a test that should
-         *    be run. Currently any method that starts with 'test'
-         *    is a candidate.
-         *    @param string $method        Method name to try.
-         *    @return boolean              True if test method.
-         *    @access protected
-         */
-        function _isTest($method) {
-            return strtolower(substr($method, 0, 4)) == 'test';
-        }
+		/**
+		 *    Tests to see if the method is a test that should
+		 *    be run. Currently any method that starts with 'test'
+		 *    is a candidate.
+		 *    @param string $method        Method name to try.
+		 *    @return boolean              True if test method.
+		 *    @access protected
+		 */
+		function _isTest($method) {
+			return strtolower(substr($method, 0, 4)) == 'test';
+		}
 
-        /**
-         *    Paints the start of a test method.
-         *    @param string $test_name     Name of test or other label.
-         *    @access public
-         */
-        function paintMethodStart($test_name) {
-            $this->_scorer->paintMethodStart($test_name);
-        }
+		/**
+		 *    Paints the start of a test method.
+		 *    @param string $test_name     Name of test or other label.
+		 *    @access public
+		 */
+		function paintMethodStart($test_name) {
+			$this->_scorer->paintMethodStart($test_name);
+		}
 
-        /**
-         *    Paints the end of a test method.
-         *    @param string $test_name     Name of test or other label.
-         *    @access public
-         */
-        function paintMethodEnd($test_name) {
-            $this->_scorer->paintMethodEnd($test_name);
-        }
+		/**
+		 *    Paints the end of a test method.
+		 *    @param string $test_name     Name of test or other label.
+		 *    @access public
+		 */
+		function paintMethodEnd($test_name) {
+			$this->_scorer->paintMethodEnd($test_name);
+		}
 
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $message        Message is ignored.
-         *    @access public
-         */
-        function paintPass($message) {
-            $this->_scorer->paintPass($message);
-        }
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $message        Message is ignored.
+		 *    @access public
+		 */
+		function paintPass($message) {
+			$this->_scorer->paintPass($message);
+		}
 
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $message        Message is ignored.
-         *    @access public
-         */
-        function paintFail($message) {
-            $this->_scorer->paintFail($message);
-        }
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $message        Message is ignored.
+		 *    @access public
+		 */
+		function paintFail($message) {
+			$this->_scorer->paintFail($message);
+		}
 
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $message    Text of error formatted by
-         *                              the test case.
-         *    @access public
-         */
-        function paintError($message) {
-            $this->_scorer->paintError($message);
-        }
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $message    Text of error formatted by
+		 *                              the test case.
+		 *    @access public
+		 */
+		function paintError($message) {
+			$this->_scorer->paintError($message);
+		}
 
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param Exception $exception     Object thrown.
-         *    @access public
-         */
-        function paintException($exception) {
-            $this->_scorer->paintException($exception);
-        }
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param Exception $exception     Object thrown.
+		 *    @access public
+		 */
+		function paintException($exception) {
+			$this->_scorer->paintException($exception);
+		}
 
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $message        Text to display.
-         *    @access public
-         */
-        function paintMessage($message) {
-            $this->_scorer->paintMessage($message);
-        }
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $message        Text to display.
+		 *    @access public
+		 */
+		function paintMessage($message) {
+			$this->_scorer->paintMessage($message);
+		}
 
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $message        Text to display.
-         *    @access public
-         */
-        function paintFormattedMessage($message) {
-            $this->_scorer->paintFormattedMessage($message);
-        }
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $message        Text to display.
+		 *    @access public
+		 */
+		function paintFormattedMessage($message) {
+			$this->_scorer->paintFormattedMessage($message);
+		}
 
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $type        Event type as text.
-         *    @param mixed $payload      Message or object.
-         *    @return boolean            Should return false if this
-         *                               type of signal should fail the
-         *                               test suite.
-         *    @access public
-         */
-        function paintSignal($type, $payload) {
-            $this->_scorer->paintSignal($type, $payload);
-        }
-    }
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $type        Event type as text.
+		 *    @param mixed $payload      Message or object.
+		 *    @return boolean            Should return false if this
+		 *                               type of signal should fail the
+		 *                               test suite.
+		 *    @access public
+		 */
+		function paintSignal($type, $payload) {
+			$this->_scorer->paintSignal($type, $payload);
+		}
+	}

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
     require_once(dirname(__FILE__) . '/scorer.php');
     require_once(dirname(__FILE__) . '/expectation.php');
     require_once(dirname(__FILE__) . '/dumper.php');
-    if (! defined('SIMPLE_TEST')) {
+    if (!defined('SIMPLE_TEST')) {
         define('SIMPLE_TEST', dirname(__FILE__) . '/');
     }
     /**#@-*/
@@ -172,7 +172,7 @@ 
             $methods = get_class_methods(get_class($this->_test_case));
             $invoker = $this->_test_case->createInvoker();
             foreach ($methods as $method) {
-                if (! $this->_isTest($method)) {
+                if (!$this->_isTest($method)) {
                     continue;
                 }
                 if ($this->_isConstructor($method)) {

tests/test_tools/simpletest/scorer.php

Doc Comments +2 added lines, -4 removed lines

@@ -261,8 +261,6 @@ 
          *    Paints the end of a group test. Will paint the page
          *    footer if the stack of tests has unwound.
          *    @param string $test_name   Name of test that is ending.
-         *    @param integer $progress   Number of test cases ending.
-         *    @access public
          */
         function paintGroupEnd($test_name) {
             array_pop($this->_test_stack);
@@ -549,7 +547,7 @@ 
          *    Chains to the wrapped reporter.
          *    @param string $type        Event type as text.
          *    @param mixed $payload      Message or object.
-         *    @return boolean            Should return false if this
+         *    @return boolean|null            Should return false if this
          *                               type of signal should fail the
          *                               test suite.
          *    @access public
@@ -763,7 +761,7 @@ 
          *    Chains to the wrapped reporter.
          *    @param string $type        Event type as text.
          *    @param mixed $payload      Message or object.
-         *    @return boolean            Should return false if this
+         *    @return boolean|null            Should return false if this
          *                               type of signal should fail the
          *                               test suite.
          *    @access public

Indentation +767 added lines, -767 removed lines

@@ -1,776 +1,776 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	UnitTester
-     *	@version	$Id: scorer.php 1532 2006-12-01 12:28:55Z xue $
-     */
-
-    /**#@+*/
-    require_once(dirname(__FILE__) . '/invoker.php');
-    /**#@-*/
-
-    /**
-     *    Can recieve test events and display them. Display
-     *    is achieved by making display methods available
-     *    and visiting the incoming event.
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	UnitTester
+	 *	@version	$Id: scorer.php 1532 2006-12-01 12:28:55Z xue $
+	 */
+
+	/**#@+*/
+	require_once(dirname(__FILE__) . '/invoker.php');
+	/**#@-*/
+
+	/**
+	 *    Can recieve test events and display them. Display
+	 *    is achieved by making display methods available
+	 *    and visiting the incoming event.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     *    @abstract
-     */
-    class SimpleScorer {
-        protected $_passes;
-        protected $_fails;
-        protected $_exceptions;
-        protected $_is_dry_run;
-
-        /**
-         *    Starts the test run with no results.
-         *    @access public
-         */
-        function SimpleScorer() {
-            $this->_passes = 0;
-            $this->_fails = 0;
-            $this->_exceptions = 0;
-            $this->_is_dry_run = false;
-        }
-
-        /**
-         *    Signals that the next evaluation will be a dry
-         *    run. That is, the structure events will be
-         *    recorded, but no tests will be run.
-         *    @param boolean $is_dry        Dry run if true.
-         *    @access public
-         */
-        function makeDry($is_dry = true) {
-            $this->_is_dry_run = $is_dry;
-        }
-
-        /**
-         *    The reporter has a veto on what should be run.
-         *    @param string $test_case_name  name of test case.
-         *    @param string $method          Name of test method.
-         *    @access public
-         */
-        function shouldInvoke($test_case_name, $method) {
-            return ! $this->_is_dry_run;
-        }
-
-        /**
-         *    Can wrap the invoker in preperation for running
-         *    a test.
-         *    @param SimpleInvoker $invoker   Individual test runner.
-         *    @return SimpleInvoker           Wrapped test runner.
-         *    @access public
-         */
-        function &createInvoker($invoker) {
-            return $invoker;
-        }
-
-        /**
-         *    Accessor for current status. Will be false
-         *    if there have been any failures or exceptions.
-         *    Used for command line tools.
-         *    @return boolean        True if no failures.
-         *    @access public
-         */
-        function getStatus() {
-            if ($this->_exceptions + $this->_fails > 0) {
-                return false;
-            }
-            return true;
-        }
-
-        /**
-         *    Paints the start of a group test.
-         *    @param string $test_name     Name of test or other label.
-         *    @param integer $size         Number of test cases starting.
-         *    @access public
-         */
-        function paintGroupStart($test_name, $size) {
-        }
-
-        /**
-         *    Paints the end of a group test.
-         *    @param string $test_name     Name of test or other label.
-         *    @access public
-         */
-        function paintGroupEnd($test_name) {
-        }
-
-        /**
-         *    Paints the start of a test case.
-         *    @param string $test_name     Name of test or other label.
-         *    @access public
-         */
-        function paintCaseStart($test_name) {
-        }
-
-        /**
-         *    Paints the end of a test case.
-         *    @param string $test_name     Name of test or other label.
-         *    @access public
-         */
-        function paintCaseEnd($test_name) {
-        }
-
-        /**
-         *    Paints the start of a test method.
-         *    @param string $test_name     Name of test or other label.
-         *    @access public
-         */
-        function paintMethodStart($test_name) {
-        }
-
-        /**
-         *    Paints the end of a test method.
-         *    @param string $test_name     Name of test or other label.
-         *    @access public
-         */
-        function paintMethodEnd($test_name) {
-        }
-
-        /**
-         *    Increments the pass count.
-         *    @param string $message        Message is ignored.
-         *    @access public
-         */
-        function paintPass($message) {
-            $this->_passes++;
-        }
-
-        /**
-         *    Increments the fail count.
-         *    @param string $message        Message is ignored.
-         *    @access public
-         */
-        function paintFail($message) {
-            $this->_fails++;
-        }
-
-        /**
-         *    Deals with PHP 4 throwing an error or PHP 5
-         *    throwing an exception.
-         *    @param string $message    Text of error formatted by
-         *                              the test case.
-         *    @access public
-         */
-        function paintError($message) {
-            $this->_exceptions++;
-        }
-
-        /**
-         *    Accessor for the number of passes so far.
-         *    @return integer       Number of passes.
-         *    @access public
-         */
-        function getPassCount() {
-            return $this->_passes;
-        }
-
-        /**
-         *    Accessor for the number of fails so far.
-         *    @return integer       Number of fails.
-         *    @access public
-         */
-        function getFailCount() {
-            return $this->_fails;
-        }
-
-        /**
-         *    Accessor for the number of untrapped errors
-         *    so far.
-         *    @return integer       Number of exceptions.
-         *    @access public
-         */
-        function getExceptionCount() {
-            return $this->_exceptions;
-        }
-
-        /**
-         *    Paints a simple supplementary message.
-         *    @param string $message        Text to display.
-         *    @access public
-         */
-        function paintMessage($message) {
-        }
-
-        /**
-         *    Paints a formatted ASCII message such as a
-         *    variable dump.
-         *    @param string $message        Text to display.
-         *    @access public
-         */
-        function paintFormattedMessage($message) {
-        }
-
-        /**
-         *    By default just ignores user generated events.
-         *    @param string $type        Event type as text.
-         *    @param mixed $payload      Message or object.
-         *    @access public
-         */
-        function paintSignal($type, $payload) {
-        }
-    }
-
-    /**
-     *    Recipient of generated test messages that can display
-     *    page footers and headers. Also keeps track of the
-     *    test nesting. This is the main base class on which
-     *    to build the finished test (page based) displays.
+	 *    @abstract
+	 */
+	class SimpleScorer {
+		protected $_passes;
+		protected $_fails;
+		protected $_exceptions;
+		protected $_is_dry_run;
+
+		/**
+		 *    Starts the test run with no results.
+		 *    @access public
+		 */
+		function SimpleScorer() {
+			$this->_passes = 0;
+			$this->_fails = 0;
+			$this->_exceptions = 0;
+			$this->_is_dry_run = false;
+		}
+
+		/**
+		 *    Signals that the next evaluation will be a dry
+		 *    run. That is, the structure events will be
+		 *    recorded, but no tests will be run.
+		 *    @param boolean $is_dry        Dry run if true.
+		 *    @access public
+		 */
+		function makeDry($is_dry = true) {
+			$this->_is_dry_run = $is_dry;
+		}
+
+		/**
+		 *    The reporter has a veto on what should be run.
+		 *    @param string $test_case_name  name of test case.
+		 *    @param string $method          Name of test method.
+		 *    @access public
+		 */
+		function shouldInvoke($test_case_name, $method) {
+			return ! $this->_is_dry_run;
+		}
+
+		/**
+		 *    Can wrap the invoker in preperation for running
+		 *    a test.
+		 *    @param SimpleInvoker $invoker   Individual test runner.
+		 *    @return SimpleInvoker           Wrapped test runner.
+		 *    @access public
+		 */
+		function &createInvoker($invoker) {
+			return $invoker;
+		}
+
+		/**
+		 *    Accessor for current status. Will be false
+		 *    if there have been any failures or exceptions.
+		 *    Used for command line tools.
+		 *    @return boolean        True if no failures.
+		 *    @access public
+		 */
+		function getStatus() {
+			if ($this->_exceptions + $this->_fails > 0) {
+				return false;
+			}
+			return true;
+		}
+
+		/**
+		 *    Paints the start of a group test.
+		 *    @param string $test_name     Name of test or other label.
+		 *    @param integer $size         Number of test cases starting.
+		 *    @access public
+		 */
+		function paintGroupStart($test_name, $size) {
+		}
+
+		/**
+		 *    Paints the end of a group test.
+		 *    @param string $test_name     Name of test or other label.
+		 *    @access public
+		 */
+		function paintGroupEnd($test_name) {
+		}
+
+		/**
+		 *    Paints the start of a test case.
+		 *    @param string $test_name     Name of test or other label.
+		 *    @access public
+		 */
+		function paintCaseStart($test_name) {
+		}
+
+		/**
+		 *    Paints the end of a test case.
+		 *    @param string $test_name     Name of test or other label.
+		 *    @access public
+		 */
+		function paintCaseEnd($test_name) {
+		}
+
+		/**
+		 *    Paints the start of a test method.
+		 *    @param string $test_name     Name of test or other label.
+		 *    @access public
+		 */
+		function paintMethodStart($test_name) {
+		}
+
+		/**
+		 *    Paints the end of a test method.
+		 *    @param string $test_name     Name of test or other label.
+		 *    @access public
+		 */
+		function paintMethodEnd($test_name) {
+		}
+
+		/**
+		 *    Increments the pass count.
+		 *    @param string $message        Message is ignored.
+		 *    @access public
+		 */
+		function paintPass($message) {
+			$this->_passes++;
+		}
+
+		/**
+		 *    Increments the fail count.
+		 *    @param string $message        Message is ignored.
+		 *    @access public
+		 */
+		function paintFail($message) {
+			$this->_fails++;
+		}
+
+		/**
+		 *    Deals with PHP 4 throwing an error or PHP 5
+		 *    throwing an exception.
+		 *    @param string $message    Text of error formatted by
+		 *                              the test case.
+		 *    @access public
+		 */
+		function paintError($message) {
+			$this->_exceptions++;
+		}
+
+		/**
+		 *    Accessor for the number of passes so far.
+		 *    @return integer       Number of passes.
+		 *    @access public
+		 */
+		function getPassCount() {
+			return $this->_passes;
+		}
+
+		/**
+		 *    Accessor for the number of fails so far.
+		 *    @return integer       Number of fails.
+		 *    @access public
+		 */
+		function getFailCount() {
+			return $this->_fails;
+		}
+
+		/**
+		 *    Accessor for the number of untrapped errors
+		 *    so far.
+		 *    @return integer       Number of exceptions.
+		 *    @access public
+		 */
+		function getExceptionCount() {
+			return $this->_exceptions;
+		}
+
+		/**
+		 *    Paints a simple supplementary message.
+		 *    @param string $message        Text to display.
+		 *    @access public
+		 */
+		function paintMessage($message) {
+		}
+
+		/**
+		 *    Paints a formatted ASCII message such as a
+		 *    variable dump.
+		 *    @param string $message        Text to display.
+		 *    @access public
+		 */
+		function paintFormattedMessage($message) {
+		}
+
+		/**
+		 *    By default just ignores user generated events.
+		 *    @param string $type        Event type as text.
+		 *    @param mixed $payload      Message or object.
+		 *    @access public
+		 */
+		function paintSignal($type, $payload) {
+		}
+	}
+
+	/**
+	 *    Recipient of generated test messages that can display
+	 *    page footers and headers. Also keeps track of the
+	 *    test nesting. This is the main base class on which
+	 *    to build the finished test (page based) displays.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class SimpleReporter extends SimpleScorer {
-        protected $_test_stack;
-        protected $_size;
-        protected $_progress;
-
-        /**
-         *    Starts the display with no results in.
-         *    @access public
-         */
-        function SimpleReporter() {
-            $this->SimpleScorer();
-            $this->_test_stack = array();
-            $this->_size = null;
-            $this->_progress = 0;
-        }
-
-        /**
-         *    Paints the start of a group test. Will also paint
-         *    the page header and footer if this is the
-         *    first test. Will stash the size if the first
-         *    start.
-         *    @param string $test_name   Name of test that is starting.
-         *    @param integer $size       Number of test cases starting.
-         *    @access public
-         */
-        function paintGroupStart($test_name, $size) {
-            if (! isset($this->_size)) {
-                $this->_size = $size;
-            }
-            if (count($this->_test_stack) == 0) {
-                $this->paintHeader($test_name);
-            }
-            $this->_test_stack[] = $test_name;
-        }
-
-        /**
-         *    Paints the end of a group test. Will paint the page
-         *    footer if the stack of tests has unwound.
-         *    @param string $test_name   Name of test that is ending.
-         *    @param integer $progress   Number of test cases ending.
-         *    @access public
-         */
-        function paintGroupEnd($test_name) {
-            array_pop($this->_test_stack);
-            if (count($this->_test_stack) == 0) {
-                $this->paintFooter($test_name);
-            }
-        }
-
-        /**
-         *    Paints the start of a test case. Will also paint
-         *    the page header and footer if this is the
-         *    first test. Will stash the size if the first
-         *    start.
-         *    @param string $test_name   Name of test that is starting.
-         *    @access public
-         */
-        function paintCaseStart($test_name) {
-            if (! isset($this->_size)) {
-                $this->_size = 1;
-            }
-            if (count($this->_test_stack) == 0) {
-                $this->paintHeader($test_name);
-            }
-            $this->_test_stack[] = $test_name;
-        }
-
-        /**
-         *    Paints the end of a test case. Will paint the page
-         *    footer if the stack of tests has unwound.
-         *    @param string $test_name   Name of test that is ending.
-         *    @access public
-         */
-        function paintCaseEnd($test_name) {
-            $this->_progress++;
-            array_pop($this->_test_stack);
-            if (count($this->_test_stack) == 0) {
-                $this->paintFooter($test_name);
-            }
-        }
-
-        /**
-         *    Paints the start of a test method.
-         *    @param string $test_name   Name of test that is starting.
-         *    @access public
-         */
-        function paintMethodStart($test_name) {
-            $this->_test_stack[] = $test_name;
-        }
-
-        /**
-         *    Paints the end of a test method. Will paint the page
-         *    footer if the stack of tests has unwound.
-         *    @param string $test_name   Name of test that is ending.
-         *    @access public
-         */
-        function paintMethodEnd($test_name) {
-            array_pop($this->_test_stack);
-        }
-
-        /**
-         *    Paints the test document header.
-         *    @param string $test_name     First test top level
-         *                                 to start.
-         *    @access public
-         *    @abstract
-         */
-        function paintHeader($test_name) {
-        }
-
-        /**
-         *    Paints the test document footer.
-         *    @param string $test_name        The top level test.
-         *    @access public
-         *    @abstract
-         */
-        function paintFooter($test_name) {
-        }
-
-        /**
-         *    Accessor for internal test stack. For
-         *    subclasses that need to see the whole test
-         *    history for display purposes.
-         *    @return array     List of methods in nesting order.
-         *    @access public
-         */
-        function getTestList() {
-            return $this->_test_stack;
-        }
-
-        /**
-         *    Accessor for total test size in number
-         *    of test cases. Null until the first
-         *    test is started.
-         *    @return integer   Total number of cases at start.
-         *    @access public
-         */
-        function getTestCaseCount() {
-            return $this->_size;
-        }
-
-        /**
-         *    Accessor for the number of test cases
-         *    completed so far.
-         *    @return integer   Number of ended cases.
-         *    @access public
-         */
-        function getTestCaseProgress() {
-            return $this->_progress;
-        }
-
-        /**
-         *    Static check for running in the comand line.
-         *    @return boolean        True if CLI.
-         *    @access public
-         *    @static
-         */
-        static function inCli() {
-            return php_sapi_name() == 'cli';
-        }
-    }
-
-    /**
-     *    For modifying the behaviour of the visual reporters.
+	 */
+	class SimpleReporter extends SimpleScorer {
+		protected $_test_stack;
+		protected $_size;
+		protected $_progress;
+
+		/**
+		 *    Starts the display with no results in.
+		 *    @access public
+		 */
+		function SimpleReporter() {
+			$this->SimpleScorer();
+			$this->_test_stack = array();
+			$this->_size = null;
+			$this->_progress = 0;
+		}
+
+		/**
+		 *    Paints the start of a group test. Will also paint
+		 *    the page header and footer if this is the
+		 *    first test. Will stash the size if the first
+		 *    start.
+		 *    @param string $test_name   Name of test that is starting.
+		 *    @param integer $size       Number of test cases starting.
+		 *    @access public
+		 */
+		function paintGroupStart($test_name, $size) {
+			if (! isset($this->_size)) {
+				$this->_size = $size;
+			}
+			if (count($this->_test_stack) == 0) {
+				$this->paintHeader($test_name);
+			}
+			$this->_test_stack[] = $test_name;
+		}
+
+		/**
+		 *    Paints the end of a group test. Will paint the page
+		 *    footer if the stack of tests has unwound.
+		 *    @param string $test_name   Name of test that is ending.
+		 *    @param integer $progress   Number of test cases ending.
+		 *    @access public
+		 */
+		function paintGroupEnd($test_name) {
+			array_pop($this->_test_stack);
+			if (count($this->_test_stack) == 0) {
+				$this->paintFooter($test_name);
+			}
+		}
+
+		/**
+		 *    Paints the start of a test case. Will also paint
+		 *    the page header and footer if this is the
+		 *    first test. Will stash the size if the first
+		 *    start.
+		 *    @param string $test_name   Name of test that is starting.
+		 *    @access public
+		 */
+		function paintCaseStart($test_name) {
+			if (! isset($this->_size)) {
+				$this->_size = 1;
+			}
+			if (count($this->_test_stack) == 0) {
+				$this->paintHeader($test_name);
+			}
+			$this->_test_stack[] = $test_name;
+		}
+
+		/**
+		 *    Paints the end of a test case. Will paint the page
+		 *    footer if the stack of tests has unwound.
+		 *    @param string $test_name   Name of test that is ending.
+		 *    @access public
+		 */
+		function paintCaseEnd($test_name) {
+			$this->_progress++;
+			array_pop($this->_test_stack);
+			if (count($this->_test_stack) == 0) {
+				$this->paintFooter($test_name);
+			}
+		}
+
+		/**
+		 *    Paints the start of a test method.
+		 *    @param string $test_name   Name of test that is starting.
+		 *    @access public
+		 */
+		function paintMethodStart($test_name) {
+			$this->_test_stack[] = $test_name;
+		}
+
+		/**
+		 *    Paints the end of a test method. Will paint the page
+		 *    footer if the stack of tests has unwound.
+		 *    @param string $test_name   Name of test that is ending.
+		 *    @access public
+		 */
+		function paintMethodEnd($test_name) {
+			array_pop($this->_test_stack);
+		}
+
+		/**
+		 *    Paints the test document header.
+		 *    @param string $test_name     First test top level
+		 *                                 to start.
+		 *    @access public
+		 *    @abstract
+		 */
+		function paintHeader($test_name) {
+		}
+
+		/**
+		 *    Paints the test document footer.
+		 *    @param string $test_name        The top level test.
+		 *    @access public
+		 *    @abstract
+		 */
+		function paintFooter($test_name) {
+		}
+
+		/**
+		 *    Accessor for internal test stack. For
+		 *    subclasses that need to see the whole test
+		 *    history for display purposes.
+		 *    @return array     List of methods in nesting order.
+		 *    @access public
+		 */
+		function getTestList() {
+			return $this->_test_stack;
+		}
+
+		/**
+		 *    Accessor for total test size in number
+		 *    of test cases. Null until the first
+		 *    test is started.
+		 *    @return integer   Total number of cases at start.
+		 *    @access public
+		 */
+		function getTestCaseCount() {
+			return $this->_size;
+		}
+
+		/**
+		 *    Accessor for the number of test cases
+		 *    completed so far.
+		 *    @return integer   Number of ended cases.
+		 *    @access public
+		 */
+		function getTestCaseProgress() {
+			return $this->_progress;
+		}
+
+		/**
+		 *    Static check for running in the comand line.
+		 *    @return boolean        True if CLI.
+		 *    @access public
+		 *    @static
+		 */
+		static function inCli() {
+			return php_sapi_name() == 'cli';
+		}
+	}
+
+	/**
+	 *    For modifying the behaviour of the visual reporters.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class SimpleReporterDecorator {
-        protected $_reporter;
-
-        /**
-         *    Mediates between teh reporter and the test case.
-         *    @param SimpleScorer $reporter       Reporter to receive events.
-         */
-        function SimpleReporterDecorator($reporter) {
-            $this->_reporter = $reporter;
-        }
-
-        /**
-         *    Signals that the next evaluation will be a dry
-         *    run. That is, the structure events will be
-         *    recorded, but no tests will be run.
-         *    @param boolean $is_dry        Dry run if true.
-         *    @access public
-         */
-        function makeDry($is_dry = true) {
-            $this->_reporter->makeDry($is_dry);
-        }
-
-        /**
-         *    Accessor for current status. Will be false
-         *    if there have been any failures or exceptions.
-         *    Used for command line tools.
-         *    @return boolean        True if no failures.
-         *    @access public
-         */
-        function getStatus() {
-            return $this->_reporter->getStatus();
-        }
-
-        /**
-         *    The reporter has a veto on what should be run.
-         *    @param string $test_case_name  name of test case.
-         *    @param string $method          Name of test method.
-         *    @return boolean                True if test should be run.
-         *    @access public
-         */
-        function shouldInvoke($test_case_name, $method) {
-            return $this->_reporter->shouldInvoke($test_case_name, $method);
-        }
-
-        /**
-         *    Can wrap the invoker in preperation for running
-         *    a test.
-         *    @param SimpleInvoker $invoker   Individual test runner.
-         *    @return SimpleInvoker           Wrapped test runner.
-         *    @access public
-         */
-        function &createInvoker($invoker) {
-            return $this->_reporter->createInvoker($invoker);
-        }
-
-        /**
-         *    Paints the start of a group test.
-         *    @param string $test_name     Name of test or other label.
-         *    @param integer $size         Number of test cases starting.
-         *    @access public
-         */
-        function paintGroupStart($test_name, $size) {
-            $this->_reporter->paintGroupStart($test_name, $size);
-        }
-
-        /**
-         *    Paints the end of a group test.
-         *    @param string $test_name     Name of test or other label.
-         *    @access public
-         */
-        function paintGroupEnd($test_name) {
-            $this->_reporter->paintGroupEnd($test_name);
-        }
-
-        /**
-         *    Paints the start of a test case.
-         *    @param string $test_name     Name of test or other label.
-         *    @access public
-         */
-        function paintCaseStart($test_name) {
-            $this->_reporter->paintCaseStart($test_name);
-        }
-
-        /**
-         *    Paints the end of a test case.
-         *    @param string $test_name     Name of test or other label.
-         *    @access public
-         */
-        function paintCaseEnd($test_name) {
-            $this->_reporter->paintCaseEnd($test_name);
-        }
-
-        /**
-         *    Paints the start of a test method.
-         *    @param string $test_name     Name of test or other label.
-         *    @access public
-         */
-        function paintMethodStart($test_name) {
-            $this->_reporter->paintMethodStart($test_name);
-        }
-
-        /**
-         *    Paints the end of a test method.
-         *    @param string $test_name     Name of test or other label.
-         *    @access public
-         */
-        function paintMethodEnd($test_name) {
-            $this->_reporter->paintMethodEnd($test_name);
-        }
-
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $message        Message is ignored.
-         *    @access public
-         */
-        function paintPass($message) {
-            $this->_reporter->paintPass($message);
-        }
-
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $message        Message is ignored.
-         *    @access public
-         */
-        function paintFail($message) {
-            $this->_reporter->paintFail($message);
-        }
-
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $message    Text of error formatted by
-         *                              the test case.
-         *    @access public
-         */
-        function paintError($message) {
-            $this->_reporter->paintError($message);
-        }
-
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $message        Text to display.
-         *    @access public
-         */
-        function paintMessage($message) {
-            $this->_reporter->paintMessage($message);
-        }
-
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $message        Text to display.
-         *    @access public
-         */
-        function paintFormattedMessage($message) {
-            $this->_reporter->paintFormattedMessage($message);
-        }
-
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $type        Event type as text.
-         *    @param mixed $payload      Message or object.
-         *    @return boolean            Should return false if this
-         *                               type of signal should fail the
-         *                               test suite.
-         *    @access public
-         */
-        function paintSignal($type, $payload) {
-            $this->_reporter->paintSignal($type, $payload);
-        }
-    }
-
-    /**
-     *    For sending messages to multiple reporters at
-     *    the same time.
+	 */
+	class SimpleReporterDecorator {
+		protected $_reporter;
+
+		/**
+		 *    Mediates between teh reporter and the test case.
+		 *    @param SimpleScorer $reporter       Reporter to receive events.
+		 */
+		function SimpleReporterDecorator($reporter) {
+			$this->_reporter = $reporter;
+		}
+
+		/**
+		 *    Signals that the next evaluation will be a dry
+		 *    run. That is, the structure events will be
+		 *    recorded, but no tests will be run.
+		 *    @param boolean $is_dry        Dry run if true.
+		 *    @access public
+		 */
+		function makeDry($is_dry = true) {
+			$this->_reporter->makeDry($is_dry);
+		}
+
+		/**
+		 *    Accessor for current status. Will be false
+		 *    if there have been any failures or exceptions.
+		 *    Used for command line tools.
+		 *    @return boolean        True if no failures.
+		 *    @access public
+		 */
+		function getStatus() {
+			return $this->_reporter->getStatus();
+		}
+
+		/**
+		 *    The reporter has a veto on what should be run.
+		 *    @param string $test_case_name  name of test case.
+		 *    @param string $method          Name of test method.
+		 *    @return boolean                True if test should be run.
+		 *    @access public
+		 */
+		function shouldInvoke($test_case_name, $method) {
+			return $this->_reporter->shouldInvoke($test_case_name, $method);
+		}
+
+		/**
+		 *    Can wrap the invoker in preperation for running
+		 *    a test.
+		 *    @param SimpleInvoker $invoker   Individual test runner.
+		 *    @return SimpleInvoker           Wrapped test runner.
+		 *    @access public
+		 */
+		function &createInvoker($invoker) {
+			return $this->_reporter->createInvoker($invoker);
+		}
+
+		/**
+		 *    Paints the start of a group test.
+		 *    @param string $test_name     Name of test or other label.
+		 *    @param integer $size         Number of test cases starting.
+		 *    @access public
+		 */
+		function paintGroupStart($test_name, $size) {
+			$this->_reporter->paintGroupStart($test_name, $size);
+		}
+
+		/**
+		 *    Paints the end of a group test.
+		 *    @param string $test_name     Name of test or other label.
+		 *    @access public
+		 */
+		function paintGroupEnd($test_name) {
+			$this->_reporter->paintGroupEnd($test_name);
+		}
+
+		/**
+		 *    Paints the start of a test case.
+		 *    @param string $test_name     Name of test or other label.
+		 *    @access public
+		 */
+		function paintCaseStart($test_name) {
+			$this->_reporter->paintCaseStart($test_name);
+		}
+
+		/**
+		 *    Paints the end of a test case.
+		 *    @param string $test_name     Name of test or other label.
+		 *    @access public
+		 */
+		function paintCaseEnd($test_name) {
+			$this->_reporter->paintCaseEnd($test_name);
+		}
+
+		/**
+		 *    Paints the start of a test method.
+		 *    @param string $test_name     Name of test or other label.
+		 *    @access public
+		 */
+		function paintMethodStart($test_name) {
+			$this->_reporter->paintMethodStart($test_name);
+		}
+
+		/**
+		 *    Paints the end of a test method.
+		 *    @param string $test_name     Name of test or other label.
+		 *    @access public
+		 */
+		function paintMethodEnd($test_name) {
+			$this->_reporter->paintMethodEnd($test_name);
+		}
+
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $message        Message is ignored.
+		 *    @access public
+		 */
+		function paintPass($message) {
+			$this->_reporter->paintPass($message);
+		}
+
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $message        Message is ignored.
+		 *    @access public
+		 */
+		function paintFail($message) {
+			$this->_reporter->paintFail($message);
+		}
+
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $message    Text of error formatted by
+		 *                              the test case.
+		 *    @access public
+		 */
+		function paintError($message) {
+			$this->_reporter->paintError($message);
+		}
+
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $message        Text to display.
+		 *    @access public
+		 */
+		function paintMessage($message) {
+			$this->_reporter->paintMessage($message);
+		}
+
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $message        Text to display.
+		 *    @access public
+		 */
+		function paintFormattedMessage($message) {
+			$this->_reporter->paintFormattedMessage($message);
+		}
+
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $type        Event type as text.
+		 *    @param mixed $payload      Message or object.
+		 *    @return boolean            Should return false if this
+		 *                               type of signal should fail the
+		 *                               test suite.
+		 *    @access public
+		 */
+		function paintSignal($type, $payload) {
+			$this->_reporter->paintSignal($type, $payload);
+		}
+	}
+
+	/**
+	 *    For sending messages to multiple reporters at
+	 *    the same time.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class MultipleReporter {
-        protected $_reporters = array();
-
-        /**
-         *    Adds a reporter to the subscriber list.
-         *    @param SimpleScorer $reporter     Reporter to receive events.
-         *    @access public
-         */
-        function attachReporter($reporter) {
-            $this->_reporters[] = $reporter;
-        }
-
-        /**
-         *    Signals that the next evaluation will be a dry
-         *    run. That is, the structure events will be
-         *    recorded, but no tests will be run.
-         *    @param boolean $is_dry        Dry run if true.
-         *    @access public
-         */
-        function makeDry($is_dry = true) {
-            for ($i = 0; $i < count($this->_reporters); $i++) {
-                $this->_reporters[$i]->makeDry($is_dry);
-            }
-        }
-
-        /**
-         *    Accessor for current status. Will be false
-         *    if there have been any failures or exceptions.
-         *    If any reporter reports a failure, the whole
-         *    suite fails.
-         *    @return boolean        True if no failures.
-         *    @access public
-         */
-        function getStatus() {
-            for ($i = 0; $i < count($this->_reporters); $i++) {
-                if (! $this->_reporters[$i]->getStatus()) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        /**
-         *    The reporter has a veto on what should be run.
-         *    It requires all reporters to want to run the method.
-         *    @param string $test_case_name  name of test case.
-         *    @param string $method          Name of test method.
-         *    @access public
-         */
-        function shouldInvoke($test_case_name, $method) {
-            for ($i = 0; $i < count($this->_reporters); $i++) {
-                if (! $this->_reporters[$i]->shouldInvoke($test_case_name, $method)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        /**
-         *    Every reporter gets a chance to wrap the invoker.
-         *    @param SimpleInvoker $invoker   Individual test runner.
-         *    @return SimpleInvoker           Wrapped test runner.
-         *    @access public
-         */
-        function &createInvoker($invoker) {
-            for ($i = 0; $i < count($this->_reporters); $i++) {
-                $invoker = $this->_reporters[$i]->createInvoker($invoker);
-            }
-            return $invoker;
-        }
-
-        /**
-         *    Paints the start of a group test.
-         *    @param string $test_name     Name of test or other label.
-         *    @param integer $size         Number of test cases starting.
-         *    @access public
-         */
-        function paintGroupStart($test_name, $size) {
-            for ($i = 0; $i < count($this->_reporters); $i++) {
-                $this->_reporters[$i]->paintGroupStart($test_name, $size);
-            }
-        }
-
-        /**
-         *    Paints the end of a group test.
-         *    @param string $test_name     Name of test or other label.
-         *    @access public
-         */
-        function paintGroupEnd($test_name) {
-            for ($i = 0; $i < count($this->_reporters); $i++) {
-                $this->_reporters[$i]->paintGroupEnd($test_name);
-            }
-        }
-
-        /**
-         *    Paints the start of a test case.
-         *    @param string $test_name     Name of test or other label.
-         *    @access public
-         */
-        function paintCaseStart($test_name) {
-            for ($i = 0; $i < count($this->_reporters); $i++) {
-                $this->_reporters[$i]->paintCaseStart($test_name);
-            }
-        }
-
-        /**
-         *    Paints the end of a test case.
-         *    @param string $test_name     Name of test or other label.
-         *    @access public
-         */
-        function paintCaseEnd($test_name) {
-            for ($i = 0; $i < count($this->_reporters); $i++) {
-                $this->_reporters[$i]->paintCaseEnd($test_name);
-            }
-        }
-
-        /**
-         *    Paints the start of a test method.
-         *    @param string $test_name     Name of test or other label.
-         *    @access public
-         */
-        function paintMethodStart($test_name) {
-            for ($i = 0; $i < count($this->_reporters); $i++) {
-                $this->_reporters[$i]->paintMethodStart($test_name);
-            }
-        }
-
-        /**
-         *    Paints the end of a test method.
-         *    @param string $test_name     Name of test or other label.
-         *    @access public
-         */
-        function paintMethodEnd($test_name) {
-            for ($i = 0; $i < count($this->_reporters); $i++) {
-                $this->_reporters[$i]->paintMethodEnd($test_name);
-            }
-        }
-
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $message        Message is ignored.
-         *    @access public
-         */
-        function paintPass($message) {
-            for ($i = 0; $i < count($this->_reporters); $i++) {
-                $this->_reporters[$i]->paintPass($message);
-            }
-        }
-
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $message        Message is ignored.
-         *    @access public
-         */
-        function paintFail($message) {
-            for ($i = 0; $i < count($this->_reporters); $i++) {
-                $this->_reporters[$i]->paintFail($message);
-            }
-        }
-
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $message    Text of error formatted by
-         *                              the test case.
-         *    @access public
-         */
-        function paintError($message) {
-            for ($i = 0; $i < count($this->_reporters); $i++) {
-                $this->_reporters[$i]->paintError($message);
-            }
-        }
-
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $message        Text to display.
-         *    @access public
-         */
-        function paintMessage($message) {
-            for ($i = 0; $i < count($this->_reporters); $i++) {
-                $this->_reporters[$i]->paintMessage($message);
-            }
-        }
-
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $message        Text to display.
-         *    @access public
-         */
-        function paintFormattedMessage($message) {
-            for ($i = 0; $i < count($this->_reporters); $i++) {
-                $this->_reporters[$i]->paintFormattedMessage($message);
-            }
-        }
-
-        /**
-         *    Chains to the wrapped reporter.
-         *    @param string $type        Event type as text.
-         *    @param mixed $payload      Message or object.
-         *    @return boolean            Should return false if this
-         *                               type of signal should fail the
-         *                               test suite.
-         *    @access public
-         */
-        function paintSignal($type, $payload) {
-            for ($i = 0; $i < count($this->_reporters); $i++) {
-                $this->_reporters[$i]->paintSignal($type, $payload);
-            }
-        }
-    }
\ No newline at end of file
+	 */
+	class MultipleReporter {
+		protected $_reporters = array();
+
+		/**
+		 *    Adds a reporter to the subscriber list.
+		 *    @param SimpleScorer $reporter     Reporter to receive events.
+		 *    @access public
+		 */
+		function attachReporter($reporter) {
+			$this->_reporters[] = $reporter;
+		}
+
+		/**
+		 *    Signals that the next evaluation will be a dry
+		 *    run. That is, the structure events will be
+		 *    recorded, but no tests will be run.
+		 *    @param boolean $is_dry        Dry run if true.
+		 *    @access public
+		 */
+		function makeDry($is_dry = true) {
+			for ($i = 0; $i < count($this->_reporters); $i++) {
+				$this->_reporters[$i]->makeDry($is_dry);
+			}
+		}
+
+		/**
+		 *    Accessor for current status. Will be false
+		 *    if there have been any failures or exceptions.
+		 *    If any reporter reports a failure, the whole
+		 *    suite fails.
+		 *    @return boolean        True if no failures.
+		 *    @access public
+		 */
+		function getStatus() {
+			for ($i = 0; $i < count($this->_reporters); $i++) {
+				if (! $this->_reporters[$i]->getStatus()) {
+					return false;
+				}
+			}
+			return true;
+		}
+
+		/**
+		 *    The reporter has a veto on what should be run.
+		 *    It requires all reporters to want to run the method.
+		 *    @param string $test_case_name  name of test case.
+		 *    @param string $method          Name of test method.
+		 *    @access public
+		 */
+		function shouldInvoke($test_case_name, $method) {
+			for ($i = 0; $i < count($this->_reporters); $i++) {
+				if (! $this->_reporters[$i]->shouldInvoke($test_case_name, $method)) {
+					return false;
+				}
+			}
+			return true;
+		}
+
+		/**
+		 *    Every reporter gets a chance to wrap the invoker.
+		 *    @param SimpleInvoker $invoker   Individual test runner.
+		 *    @return SimpleInvoker           Wrapped test runner.
+		 *    @access public
+		 */
+		function &createInvoker($invoker) {
+			for ($i = 0; $i < count($this->_reporters); $i++) {
+				$invoker = $this->_reporters[$i]->createInvoker($invoker);
+			}
+			return $invoker;
+		}
+
+		/**
+		 *    Paints the start of a group test.
+		 *    @param string $test_name     Name of test or other label.
+		 *    @param integer $size         Number of test cases starting.
+		 *    @access public
+		 */
+		function paintGroupStart($test_name, $size) {
+			for ($i = 0; $i < count($this->_reporters); $i++) {
+				$this->_reporters[$i]->paintGroupStart($test_name, $size);
+			}
+		}
+
+		/**
+		 *    Paints the end of a group test.
+		 *    @param string $test_name     Name of test or other label.
+		 *    @access public
+		 */
+		function paintGroupEnd($test_name) {
+			for ($i = 0; $i < count($this->_reporters); $i++) {
+				$this->_reporters[$i]->paintGroupEnd($test_name);
+			}
+		}
+
+		/**
+		 *    Paints the start of a test case.
+		 *    @param string $test_name     Name of test or other label.
+		 *    @access public
+		 */
+		function paintCaseStart($test_name) {
+			for ($i = 0; $i < count($this->_reporters); $i++) {
+				$this->_reporters[$i]->paintCaseStart($test_name);
+			}
+		}
+
+		/**
+		 *    Paints the end of a test case.
+		 *    @param string $test_name     Name of test or other label.
+		 *    @access public
+		 */
+		function paintCaseEnd($test_name) {
+			for ($i = 0; $i < count($this->_reporters); $i++) {
+				$this->_reporters[$i]->paintCaseEnd($test_name);
+			}
+		}
+
+		/**
+		 *    Paints the start of a test method.
+		 *    @param string $test_name     Name of test or other label.
+		 *    @access public
+		 */
+		function paintMethodStart($test_name) {
+			for ($i = 0; $i < count($this->_reporters); $i++) {
+				$this->_reporters[$i]->paintMethodStart($test_name);
+			}
+		}
+
+		/**
+		 *    Paints the end of a test method.
+		 *    @param string $test_name     Name of test or other label.
+		 *    @access public
+		 */
+		function paintMethodEnd($test_name) {
+			for ($i = 0; $i < count($this->_reporters); $i++) {
+				$this->_reporters[$i]->paintMethodEnd($test_name);
+			}
+		}
+
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $message        Message is ignored.
+		 *    @access public
+		 */
+		function paintPass($message) {
+			for ($i = 0; $i < count($this->_reporters); $i++) {
+				$this->_reporters[$i]->paintPass($message);
+			}
+		}
+
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $message        Message is ignored.
+		 *    @access public
+		 */
+		function paintFail($message) {
+			for ($i = 0; $i < count($this->_reporters); $i++) {
+				$this->_reporters[$i]->paintFail($message);
+			}
+		}
+
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $message    Text of error formatted by
+		 *                              the test case.
+		 *    @access public
+		 */
+		function paintError($message) {
+			for ($i = 0; $i < count($this->_reporters); $i++) {
+				$this->_reporters[$i]->paintError($message);
+			}
+		}
+
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $message        Text to display.
+		 *    @access public
+		 */
+		function paintMessage($message) {
+			for ($i = 0; $i < count($this->_reporters); $i++) {
+				$this->_reporters[$i]->paintMessage($message);
+			}
+		}
+
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $message        Text to display.
+		 *    @access public
+		 */
+		function paintFormattedMessage($message) {
+			for ($i = 0; $i < count($this->_reporters); $i++) {
+				$this->_reporters[$i]->paintFormattedMessage($message);
+			}
+		}
+
+		/**
+		 *    Chains to the wrapped reporter.
+		 *    @param string $type        Event type as text.
+		 *    @param mixed $payload      Message or object.
+		 *    @return boolean            Should return false if this
+		 *                               type of signal should fail the
+		 *                               test suite.
+		 *    @access public
+		 */
+		function paintSignal($type, $payload) {
+			for ($i = 0; $i < count($this->_reporters); $i++) {
+				$this->_reporters[$i]->paintSignal($type, $payload);
+			}
+		}
+	}
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -53,7 +53,7 @@ 
          *    @access public
          */
         function shouldInvoke($test_case_name, $method) {
-            return ! $this->_is_dry_run;
+            return !$this->_is_dry_run;
         }
 
         /**
@@ -248,7 +248,7 @@ 
          *    @access public
          */
         function paintGroupStart($test_name, $size) {
-            if (! isset($this->_size)) {
+            if (!isset($this->_size)) {
                 $this->_size = $size;
             }
             if (count($this->_test_stack) == 0) {
@@ -280,7 +280,7 @@ 
          *    @access public
          */
         function paintCaseStart($test_name) {
-            if (! isset($this->_size)) {
+            if (!isset($this->_size)) {
                 $this->_size = 1;
             }
             if (count($this->_test_stack) == 0) {
@@ -600,7 +600,7 @@ 
          */
         function getStatus() {
             for ($i = 0; $i < count($this->_reporters); $i++) {
-                if (! $this->_reporters[$i]->getStatus()) {
+                if (!$this->_reporters[$i]->getStatus()) {
                     return false;
                 }
             }
@@ -616,7 +616,7 @@ 
          */
         function shouldInvoke($test_case_name, $method) {
             for ($i = 0; $i < count($this->_reporters); $i++) {
-                if (! $this->_reporters[$i]->shouldInvoke($test_case_name, $method)) {
+                if (!$this->_reporters[$i]->shouldInvoke($test_case_name, $method)) {
                     return false;
                 }
             }

tests/test_tools/simpletest/shell_tester.php

Doc Comments +4 added lines, -4 removed lines

@@ -53,7 +53,7 @@ 
 
         /**
          *    Accessor for the last output.
-         *    @return array         Output as array of lines.
+         *    @return boolean         Output as array of lines.
          *    @access public
          */
 		function getOutputAsList() {
@@ -120,7 +120,7 @@ 
 
         /**
          *    Accessor for the last output.
-         *    @return array         Output as array of lines.
+         *    @return boolean         Output as array of lines.
          *    @access public
          */
 		function getOutputAsList() {
@@ -286,7 +286,7 @@ 
         /**
          *    Accessor for current shell. Used for testing the
          *    the tester itself.
-         *    @return Shell        Current shell.
+         *    @return SimpleShell        Current shell.
          *    @access protected
          */
         function &_getShell() {
@@ -295,7 +295,7 @@ 
 
         /**
          *    Factory for the shell to run the command on.
-         *    @return Shell        New shell object.
+         *    @return SimpleShell        New shell object.
          *    @access protected
          */
         function &_createShell() {

Indentation +267 added lines, -267 removed lines

@@ -1,305 +1,305 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	UnitTester
-     *	@version	$Id: shell_tester.php 1398 2006-09-08 19:31:03Z xue $
-     */
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	UnitTester
+	 *	@version	$Id: shell_tester.php 1398 2006-09-08 19:31:03Z xue $
+	 */
 
-    /**#@+
+	/**#@+
      *	include other SimpleTest class files
      */
-    require_once(dirname(__FILE__) . '/test_case.php');
-    /**#@-*/
+	require_once(dirname(__FILE__) . '/test_case.php');
+	/**#@-*/
 
-    /**
-     *    Wrapper for exec() functionality.
+	/**
+	 *    Wrapper for exec() functionality.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class SimpleShell {
-        protected $_output;
+	 */
+	class SimpleShell {
+		protected $_output;
 
-        /**
-         *    Executes the shell comand and stashes the output.
-         *    @access public
-         */
-        function SimpleShell() {
-            $this->_output = false;
-        }
+		/**
+		 *    Executes the shell comand and stashes the output.
+		 *    @access public
+		 */
+		function SimpleShell() {
+			$this->_output = false;
+		}
 
-        /**
-         *    Actually runs the command. Does not trap the
-         *    error stream output as this need PHP 4.3+.
-         *    @param string $command    The actual command line
-         *                              to run.
-         *    @return integer           Exit code.
-         *    @access public
-         */
-        function execute($command) {
-            $this->_output = false;
-            exec($command, $this->_output, $ret);
-            return $ret;
-        }
+		/**
+		 *    Actually runs the command. Does not trap the
+		 *    error stream output as this need PHP 4.3+.
+		 *    @param string $command    The actual command line
+		 *                              to run.
+		 *    @return integer           Exit code.
+		 *    @access public
+		 */
+		function execute($command) {
+			$this->_output = false;
+			exec($command, $this->_output, $ret);
+			return $ret;
+		}
 
-        /**
-         *    Accessor for the last output.
-         *    @return string        Output as text.
-         *    @access public
-         */
-        function getOutput() {
-            return implode("\n", $this->_output);
-        }
+		/**
+		 *    Accessor for the last output.
+		 *    @return string        Output as text.
+		 *    @access public
+		 */
+		function getOutput() {
+			return implode("\n", $this->_output);
+		}
 
-        /**
-         *    Accessor for the last output.
-         *    @return array         Output as array of lines.
-         *    @access public
-         */
+		/**
+		 *    Accessor for the last output.
+		 *    @return array         Output as array of lines.
+		 *    @access public
+		 */
 		function getOutputAsList() {
 			return $this->_output;
 		}
-    }
+	}
 
-    /**
-     *    Test case for testing of command line scripts and
-     *    utilities. Usually scripts taht are external to the
-     *    PHP code, but support it in some way.
+	/**
+	 *    Test case for testing of command line scripts and
+	 *    utilities. Usually scripts taht are external to the
+	 *    PHP code, but support it in some way.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class ShellTestCase extends SimpleTestCase {
-        protected $_current_shell;
-        protected $_last_status;
-        protected $_last_command;
+	 */
+	class ShellTestCase extends SimpleTestCase {
+		protected $_current_shell;
+		protected $_last_status;
+		protected $_last_command;
 
-        /**
-         *    Creates an empty test case. Should be subclassed
-         *    with test methods for a functional test case.
-         *    @param string $label     Name of test case. Will use
-         *                             the class name if none specified.
-         *    @access public
-         */
-        function ShellTestCase($label = false) {
-            $this->SimpleTestCase($label);
-            $this->_current_shell = $this->_createShell();
-            $this->_last_status = false;
-            $this->_last_command = '';
-        }
+		/**
+		 *    Creates an empty test case. Should be subclassed
+		 *    with test methods for a functional test case.
+		 *    @param string $label     Name of test case. Will use
+		 *                             the class name if none specified.
+		 *    @access public
+		 */
+		function ShellTestCase($label = false) {
+			$this->SimpleTestCase($label);
+			$this->_current_shell = $this->_createShell();
+			$this->_last_status = false;
+			$this->_last_command = '';
+		}
 
-        /**
-         *    Executes a command and buffers the results.
-         *    @param string $command     Command to run.
-         *    @return boolean            True if zero exit code.
-         *    @access public
-         */
-        function execute($command) {
-            $shell = $this->_getShell();
-            $this->_last_status = $shell->execute($command);
-            $this->_last_command = $command;
-            return ($this->_last_status === 0);
-        }
+		/**
+		 *    Executes a command and buffers the results.
+		 *    @param string $command     Command to run.
+		 *    @return boolean            True if zero exit code.
+		 *    @access public
+		 */
+		function execute($command) {
+			$shell = $this->_getShell();
+			$this->_last_status = $shell->execute($command);
+			$this->_last_command = $command;
+			return ($this->_last_status === 0);
+		}
 
-        /**
-         *    Dumps the output of the last command.
-         *    @access public
-         */
-        function dumpOutput() {
-            $this->dump($this->getOutput());
-        }
+		/**
+		 *    Dumps the output of the last command.
+		 *    @access public
+		 */
+		function dumpOutput() {
+			$this->dump($this->getOutput());
+		}
 
-        /**
-         *    Accessor for the last output.
-         *    @return string        Output as text.
-         *    @access public
-         */
+		/**
+		 *    Accessor for the last output.
+		 *    @return string        Output as text.
+		 *    @access public
+		 */
 		function getOutput() {
-            $shell = $this->_getShell();
-            return $shell->getOutput();
+			$shell = $this->_getShell();
+			return $shell->getOutput();
 		}
 
-        /**
-         *    Accessor for the last output.
-         *    @return array         Output as array of lines.
-         *    @access public
-         */
+		/**
+		 *    Accessor for the last output.
+		 *    @return array         Output as array of lines.
+		 *    @access public
+		 */
 		function getOutputAsList() {
-            $shell = $this->_getShell();
-            return $shell->getOutputAsList();
+			$shell = $this->_getShell();
+			return $shell->getOutputAsList();
 		}
 
-        /**
-         *    Will trigger a pass if the two parameters have
-         *    the same value only. Otherwise a fail. This
-         *    is for testing hand extracted text, etc.
-         *    @param mixed $first          Value to compare.
-         *    @param mixed $second         Value to compare.
-         *    @param string $message       Message to display.
-         *    @return boolean              True on pass
-         *    @access public
-         */
-        function assertEqual($first, $second, $message = "%s") {
-            return $this->assert(
-                    new EqualExpectation($first),
-                    $second,
-                    $message);
-        }
+		/**
+		 *    Will trigger a pass if the two parameters have
+		 *    the same value only. Otherwise a fail. This
+		 *    is for testing hand extracted text, etc.
+		 *    @param mixed $first          Value to compare.
+		 *    @param mixed $second         Value to compare.
+		 *    @param string $message       Message to display.
+		 *    @return boolean              True on pass
+		 *    @access public
+		 */
+		function assertEqual($first, $second, $message = "%s") {
+			return $this->assert(
+					new EqualExpectation($first),
+					$second,
+					$message);
+		}
 
-        /**
-         *    Will trigger a pass if the two parameters have
-         *    a different value. Otherwise a fail. This
-         *    is for testing hand extracted text, etc.
-         *    @param mixed $first           Value to compare.
-         *    @param mixed $second          Value to compare.
-         *    @param string $message        Message to display.
-         *    @return boolean               True on pass
-         *    @access public
-         */
-        function assertNotEqual($first, $second, $message = "%s") {
-            return $this->assert(
-                    new NotEqualExpectation($first),
-                    $second,
-                    $message);
-        }
+		/**
+		 *    Will trigger a pass if the two parameters have
+		 *    a different value. Otherwise a fail. This
+		 *    is for testing hand extracted text, etc.
+		 *    @param mixed $first           Value to compare.
+		 *    @param mixed $second          Value to compare.
+		 *    @param string $message        Message to display.
+		 *    @return boolean               True on pass
+		 *    @access public
+		 */
+		function assertNotEqual($first, $second, $message = "%s") {
+			return $this->assert(
+					new NotEqualExpectation($first),
+					$second,
+					$message);
+		}
 
-        /**
-         *    Tests the last status code from the shell.
-         *    @param integer $status   Expected status of last
-         *                             command.
-         *    @param string $message   Message to display.
-         *    @return boolean          True if pass.
-         *    @access public
-         */
-        function assertExitCode($status, $message = "%s") {
-            $message = sprintf($message, "Expected status code of [$status] from [" .
-                    $this->_last_command . "], but got [" .
-                    $this->_last_status . "]");
-            return $this->assertTrue($status === $this->_last_status, $message);
-        }
+		/**
+		 *    Tests the last status code from the shell.
+		 *    @param integer $status   Expected status of last
+		 *                             command.
+		 *    @param string $message   Message to display.
+		 *    @return boolean          True if pass.
+		 *    @access public
+		 */
+		function assertExitCode($status, $message = "%s") {
+			$message = sprintf($message, "Expected status code of [$status] from [" .
+					$this->_last_command . "], but got [" .
+					$this->_last_status . "]");
+			return $this->assertTrue($status === $this->_last_status, $message);
+		}
 
-        /**
-         *    Attempt to exactly match the combined STDERR and
-         *    STDOUT output.
-         *    @param string $expected  Expected output.
-         *    @param string $message   Message to display.
-         *    @return boolean          True if pass.
-         *    @access public
-         */
-        function assertOutput($expected, $message = "%s") {
-            $shell = $this->_getShell();
-            return $this->assert(
-                    new EqualExpectation($expected),
-                    $shell->getOutput(),
-                    $message);
-        }
+		/**
+		 *    Attempt to exactly match the combined STDERR and
+		 *    STDOUT output.
+		 *    @param string $expected  Expected output.
+		 *    @param string $message   Message to display.
+		 *    @return boolean          True if pass.
+		 *    @access public
+		 */
+		function assertOutput($expected, $message = "%s") {
+			$shell = $this->_getShell();
+			return $this->assert(
+					new EqualExpectation($expected),
+					$shell->getOutput(),
+					$message);
+		}
 
-        /**
-         *    Scans the output for a Perl regex. If found
-         *    anywhere it passes, else it fails.
-         *    @param string $pattern    Regex to search for.
-         *    @param string $message    Message to display.
-         *    @return boolean           True if pass.
-         *    @access public
-         */
-        function assertOutputPattern($pattern, $message = "%s") {
-            $shell = $this->_getShell();
-            return $this->assert(
-                    new PatternExpectation($pattern),
-                    $shell->getOutput(),
-                    $message);
-        }
+		/**
+		 *    Scans the output for a Perl regex. If found
+		 *    anywhere it passes, else it fails.
+		 *    @param string $pattern    Regex to search for.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True if pass.
+		 *    @access public
+		 */
+		function assertOutputPattern($pattern, $message = "%s") {
+			$shell = $this->_getShell();
+			return $this->assert(
+					new PatternExpectation($pattern),
+					$shell->getOutput(),
+					$message);
+		}
 
-        /**
-         *    If a Perl regex is found anywhere in the current
-         *    output then a failure is generated, else a pass.
-         *    @param string $pattern    Regex to search for.
-         *    @param $message           Message to display.
-         *    @return boolean           True if pass.
-         *    @access public
-         */
-        function assertNoOutputPattern($pattern, $message = "%s") {
-            $shell = $this->_getShell();
-            return $this->assert(
-                    new NoPatternExpectation($pattern),
-                    $shell->getOutput(),
-                    $message);
-        }
+		/**
+		 *    If a Perl regex is found anywhere in the current
+		 *    output then a failure is generated, else a pass.
+		 *    @param string $pattern    Regex to search for.
+		 *    @param $message           Message to display.
+		 *    @return boolean           True if pass.
+		 *    @access public
+		 */
+		function assertNoOutputPattern($pattern, $message = "%s") {
+			$shell = $this->_getShell();
+			return $this->assert(
+					new NoPatternExpectation($pattern),
+					$shell->getOutput(),
+					$message);
+		}
 
-        /**
-         *    File existence check.
-         *    @param string $path      Full filename and path.
-         *    @param string $message   Message to display.
-         *    @return boolean          True if pass.
-         *    @access public
-         */
-        function assertFileExists($path, $message = "%s") {
-            $message = sprintf($message, "File [$path] should exist");
-            return $this->assertTrue(file_exists($path), $message);
-        }
+		/**
+		 *    File existence check.
+		 *    @param string $path      Full filename and path.
+		 *    @param string $message   Message to display.
+		 *    @return boolean          True if pass.
+		 *    @access public
+		 */
+		function assertFileExists($path, $message = "%s") {
+			$message = sprintf($message, "File [$path] should exist");
+			return $this->assertTrue(file_exists($path), $message);
+		}
 
-        /**
-         *    File non-existence check.
-         *    @param string $path      Full filename and path.
-         *    @param string $message   Message to display.
-         *    @return boolean          True if pass.
-         *    @access public
-         */
-        function assertFileNotExists($path, $message = "%s") {
-            $message = sprintf($message, "File [$path] should not exist");
-            return $this->assertFalse(file_exists($path), $message);
-        }
+		/**
+		 *    File non-existence check.
+		 *    @param string $path      Full filename and path.
+		 *    @param string $message   Message to display.
+		 *    @return boolean          True if pass.
+		 *    @access public
+		 */
+		function assertFileNotExists($path, $message = "%s") {
+			$message = sprintf($message, "File [$path] should not exist");
+			return $this->assertFalse(file_exists($path), $message);
+		}
 
-        /**
-         *    Scans a file for a Perl regex. If found
-         *    anywhere it passes, else it fails.
-         *    @param string $pattern    Regex to search for.
-         *    @param string $path       Full filename and path.
-         *    @param string $message    Message to display.
-         *    @return boolean           True if pass.
-         *    @access public
-         */
-        function assertFilePattern($pattern, $path, $message = "%s") {
-            $shell = $this->_getShell();
-            return $this->assert(
-                    new PatternExpectation($pattern),
-                    implode('', file($path)),
-                    $message);
-        }
+		/**
+		 *    Scans a file for a Perl regex. If found
+		 *    anywhere it passes, else it fails.
+		 *    @param string $pattern    Regex to search for.
+		 *    @param string $path       Full filename and path.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True if pass.
+		 *    @access public
+		 */
+		function assertFilePattern($pattern, $path, $message = "%s") {
+			$shell = $this->_getShell();
+			return $this->assert(
+					new PatternExpectation($pattern),
+					implode('', file($path)),
+					$message);
+		}
 
-        /**
-         *    If a Perl regex is found anywhere in the named
-         *    file then a failure is generated, else a pass.
-         *    @param string $pattern    Regex to search for.
-         *    @param string $path       Full filename and path.
-         *    @param string $message    Message to display.
-         *    @return boolean           True if pass.
-         *    @access public
-         */
-        function assertNoFilePattern($pattern, $path, $message = "%s") {
-            $shell = $this->_getShell();
-            return $this->assert(
-                    new NoPatternExpectation($pattern),
-                    implode('', file($path)),
-                    $message);
-        }
+		/**
+		 *    If a Perl regex is found anywhere in the named
+		 *    file then a failure is generated, else a pass.
+		 *    @param string $pattern    Regex to search for.
+		 *    @param string $path       Full filename and path.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True if pass.
+		 *    @access public
+		 */
+		function assertNoFilePattern($pattern, $path, $message = "%s") {
+			$shell = $this->_getShell();
+			return $this->assert(
+					new NoPatternExpectation($pattern),
+					implode('', file($path)),
+					$message);
+		}
 
-        /**
-         *    Accessor for current shell. Used for testing the
-         *    the tester itself.
-         *    @return Shell        Current shell.
-         *    @access protected
-         */
-        function &_getShell() {
-            return $this->_current_shell;
-        }
+		/**
+		 *    Accessor for current shell. Used for testing the
+		 *    the tester itself.
+		 *    @return Shell        Current shell.
+		 *    @access protected
+		 */
+		function &_getShell() {
+			return $this->_current_shell;
+		}
 
-        /**
-         *    Factory for the shell to run the command on.
-         *    @return Shell        New shell object.
-         *    @access protected
-         */
-        function &_createShell() {
-            $shell = new SimpleShell();
-            return $shell;
-        }
-    }
\ No newline at end of file
+		/**
+		 *    Factory for the shell to run the command on.
+		 *    @return Shell        New shell object.
+		 *    @access protected
+		 */
+		function &_createShell() {
+			$shell = new SimpleShell();
+			return $shell;
+		}
+	}
\ No newline at end of file

tests/test_tools/simpletest/simple_test.php

Doc Comments +2 added lines, -6 removed lines

@@ -67,7 +67,7 @@ 
          *    the tests differently. This version simply
          *    passes it straight through.
          *    @param SimpleReporter $reporter    Incoming observer.
-         *    @return SimpleReporter
+         *    @return SimpleRunner
          *    @access protected
          */
         function _createRunner($reporter) {
@@ -237,7 +237,7 @@ 
          *    Sends a formatted dump of a variable to the
          *    test suite for those emergency debugging
          *    situations.
-         *    @param mixed $variable    Variable to display.
+         *    @param string|boolean $variable    Variable to display.
          *    @param string $message    Message to display.
          *    @return mixed             The original variable.
          *    @access public
@@ -323,10 +323,6 @@ 
         /**
          *    Adds a test into the suite by class name. The class will
          *    be instantiated as needed.
-         *    @param SimpleTestCase $test_case  Suite or individual test
-         *                                      case implementing the
-         *                                      runnable test interface.
-         *    @access public
          */
         function addTestClass($class) {
             $this->_test_cases[] = $class;

Indentation +542 added lines, -542 removed lines

@@ -1,552 +1,552 @@
 <?php
-    /**
-     *	Base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	UnitTester
-     *	@version	$Id: simple_test.php 1532 2006-12-01 12:28:55Z xue $
-     */
-
-    /**#@+
+	/**
+	 *	Base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	UnitTester
+	 *	@version	$Id: simple_test.php 1532 2006-12-01 12:28:55Z xue $
+	 */
+
+	/**#@+
      * Includes SimpleTest files and defined the root constant
      * for dependent libraries.
      */
-    require_once(dirname(__FILE__) . '/errors.php');
-    require_once(dirname(__FILE__) . '/options.php');
-    require_once(dirname(__FILE__) . '/runner.php');
-    require_once(dirname(__FILE__) . '/scorer.php');
-    require_once(dirname(__FILE__) . '/expectation.php');
-    require_once(dirname(__FILE__) . '/dumper.php');
-    if (! defined('SIMPLE_TEST')) {
-        define('SIMPLE_TEST', dirname(__FILE__) . '/');
-    }
-    /**#@-*/
-
-    /**
-     *    Basic test case. This is the smallest unit of a test
-     *    suite. It searches for
-     *    all methods that start with the the string "test" and
-     *    runs them. Working test cases extend this class.
+	require_once(dirname(__FILE__) . '/errors.php');
+	require_once(dirname(__FILE__) . '/options.php');
+	require_once(dirname(__FILE__) . '/runner.php');
+	require_once(dirname(__FILE__) . '/scorer.php');
+	require_once(dirname(__FILE__) . '/expectation.php');
+	require_once(dirname(__FILE__) . '/dumper.php');
+	if (! defined('SIMPLE_TEST')) {
+		define('SIMPLE_TEST', dirname(__FILE__) . '/');
+	}
+	/**#@-*/
+
+	/**
+	 *    Basic test case. This is the smallest unit of a test
+	 *    suite. It searches for
+	 *    all methods that start with the the string "test" and
+	 *    runs them. Working test cases extend this class.
 	 *    @package		SimpleTest
 	 *    @subpackage	UnitTester
-     */
-    class SimpleTestCase {
-        protected $_label;
-        protected $_runner;
-
-        /**
-         *    Sets up the test with no display.
-         *    @param string $label    If no test name is given then
-         *                            the class name is used.
-         *    @access public
-         */
-        function SimpleTestCase($label = false) {
-            $this->_label = $label ? $label : get_class($this);
-            $this->_runner = false;
-        }
-
-        /**
-         *    Accessor for the test name for subclasses.
-         *    @return string           Name of the test.
-         *    @access public
-         */
-        function getLabel() {
-            return $this->_label;
-        }
-
-        /**
-         *    Used to invoke the single tests.
-         *    @return SimpleInvoker        Individual test runner.
-         *    @access public
-         */
-        function createInvoker() {
-            return new SimpleErrorTrappingInvoker(new SimpleInvoker($this));
-        }
-
-        /**
-         *    Can modify the incoming reporter so as to run
-         *    the tests differently. This version simply
-         *    passes it straight through.
-         *    @param SimpleReporter $reporter    Incoming observer.
-         *    @return SimpleReporter
-         *    @access protected
-         */
-        function _createRunner($reporter) {
-            return new SimpleRunner($this, $reporter);
-        }
-
-        /**
-         *    Uses reflection to run every method within itself
-         *    starting with the string "test" unless a method
-         *    is specified.
-         *    @param SimpleReporter $reporter    Current test reporter.
-         *    @access public
-         */
-        function run($reporter) {
-            $reporter->paintCaseStart($this->getLabel());
-            $this->_runner = $this->_createRunner($reporter);
-            $this->_runner->run();
-            $reporter->paintCaseEnd($this->getLabel());
-            return $reporter->getStatus();
-        }
-
-        /**
-         *    Sets up unit test wide variables at the start
-         *    of each test method. To be overridden in
-         *    actual user test cases.
-         *    @access public
-         */
-        function setUp() {
-        }
-
-        /**
-         *    Clears the data set in the setUp() method call.
-         *    To be overridden by the user in actual user test cases.
-         *    @access public
-         */
-        function tearDown() {
-        }
-
-        /**
-         *    Sends a pass event with a message.
-         *    @param string $message        Message to send.
-         *    @access public
-         */
-        function pass($message = "Pass") {
-            $this->_runner->paintPass($message . $this->getAssertionLine(' at line [%d]'));
-        }
-
-        /**
-         *    Sends a fail event with a message.
-         *    @param string $message        Message to send.
-         *    @access public
-         */
-        function fail($message = "Fail") {
-            $this->_runner->paintFail($message . $this->getAssertionLine(' at line [%d]'));
-        }
-
-        /**
-         *    Formats a PHP error and dispatches it to the
-         *    runner.
-         *    @param integer $severity  PHP error code.
-         *    @param string $message    Text of error.
-         *    @param string $file       File error occoured in.
-         *    @param integer $line      Line number of error.
-         *    @param hash $globals      PHP super global arrays.
-         *    @access public
-         */
-        function error($severity, $message, $file, $line, $globals) {
-            $severity = SimpleErrorQueue::getSeverityAsString($severity);
-            $this->_runner->paintError(
-                    "Unexpected PHP error [$message] severity [$severity] in [$file] line [$line]");
-        }
-
-        /**
-         *    Sends a user defined event to the test runner.
-         *    This is for small scale extension where
-         *    both the test case and either the runner or
-         *    display are subclassed.
-         *    @param string $type       Type of event.
-         *    @param mixed $payload     Object or message to deliver.
-         *    @access public
-         */
-        function signal($type, $payload) {
-            $this->_runner->paintSignal($type, $payload);
-        }
-
-        /**
-         *    Cancels any outstanding errors.
-         *    @access public
-         */
-        function swallowErrors() {
-            $queue = SimpleErrorQueue::instance();
-            $queue->clear();
-        }
-
-        /**
-         *    Runs an expectation directly, for extending the
-         *    tests with new expectation classes.
-         *    @param SimpleExpectation $expectation  Expectation subclass.
-         *    @param mixed $test_value               Value to compare.
-         *    @param string $message                 Message to display.
-         *    @return boolean                        True on pass
-         *    @access public
-         */
-        function assertExpectation($expectation, $test_value, $message = '%s') {
-            return $this->assertTrue(
-                    $expectation->test($test_value),
-                    sprintf($message, $expectation->overlayMessage($test_value)));
-        }
-
-        /**
-         *    Called from within the test methods to register
-         *    passes and failures.
-         *    @param boolean $result    Pass on true.
-         *    @param string $message    Message to display describing
-         *                              the test state.
-         *    @return boolean           True on pass
-         *    @access public
-         */
-        function assertTrue($result, $message = false) {
-            if (! $message) {
-                $message = 'True assertion got ' . ($result ? 'True' : 'False');
-            }
-            if ($result) {
-                $this->pass($message);
-                return true;
-            } else {
-                $this->fail($message);
-                return false;
-            }
-        }
-
-        /**
-         *    Will be true on false and vice versa. False
-         *    is the PHP definition of false, so that null,
-         *    empty strings, zero and an empty array all count
-         *    as false.
-         *    @param boolean $result    Pass on false.
-         *    @param string $message    Message to display.
-         *    @return boolean           True on pass
-         *    @access public
-         */
-        function assertFalse($result, $message = false) {
-            if (! $message) {
-                $message = 'False assertion got ' . ($result ? 'True' : 'False');
-            }
-            return $this->assertTrue(! $result, $message);
-        }
-
-        /**
-         *    Uses a stack trace to find the line of an assertion.
-         *    @param string $format    String formatting.
-         *    @param array $stack      Stack frames top most first. Only
-         *                             needed if not using the PHP
-         *                             backtrace function.
-         *    @return string           Line number of first assert*
-         *                             method embedded in format string.
-         *    @access public
-         */
-        function getAssertionLine($format = '%d', $stack = false) {
-            if ($stack === false) {
-                $stack = SimpleTestCompatibility::getStackTrace();
-            }
-            return SimpleDumper::getFormattedAssertionLine($stack, $format);
-        }
-
-        /**
-         *    Sends a formatted dump of a variable to the
-         *    test suite for those emergency debugging
-         *    situations.
-         *    @param mixed $variable    Variable to display.
-         *    @param string $message    Message to display.
-         *    @return mixed             The original variable.
-         *    @access public
-         */
-        function dump($variable, $message = false) {
-            $formatted = SimpleDumper::dump($variable);
-            if ($message) {
-                $formatted = $message . "\n" . $formatted;
-            }
-            $this->_runner->paintFormattedMessage($formatted);
-            return $variable;
-        }
-
-        /**
-         *    Dispatches a text message straight to the
-         *    test suite. Useful for status bar displays.
-         *    @param string $message        Message to show.
-         *    @access public
-         */
-        function sendMessage($message) {
-            $this->_runner->PaintMessage($message);
-        }
-
-        /**
-         *    Accessor for the number of subtests.
-         *    @return integer           Number of test cases.
-         *    @access public
-         *    @static
-         */
-        static function getSize() {
-            return 1;
-        }
-    }
-
-    /**
-     *    This is a composite test class for combining
-     *    test cases and other RunnableTest classes into
-     *    a group test.
+	 */
+	class SimpleTestCase {
+		protected $_label;
+		protected $_runner;
+
+		/**
+		 *    Sets up the test with no display.
+		 *    @param string $label    If no test name is given then
+		 *                            the class name is used.
+		 *    @access public
+		 */
+		function SimpleTestCase($label = false) {
+			$this->_label = $label ? $label : get_class($this);
+			$this->_runner = false;
+		}
+
+		/**
+		 *    Accessor for the test name for subclasses.
+		 *    @return string           Name of the test.
+		 *    @access public
+		 */
+		function getLabel() {
+			return $this->_label;
+		}
+
+		/**
+		 *    Used to invoke the single tests.
+		 *    @return SimpleInvoker        Individual test runner.
+		 *    @access public
+		 */
+		function createInvoker() {
+			return new SimpleErrorTrappingInvoker(new SimpleInvoker($this));
+		}
+
+		/**
+		 *    Can modify the incoming reporter so as to run
+		 *    the tests differently. This version simply
+		 *    passes it straight through.
+		 *    @param SimpleReporter $reporter    Incoming observer.
+		 *    @return SimpleReporter
+		 *    @access protected
+		 */
+		function _createRunner($reporter) {
+			return new SimpleRunner($this, $reporter);
+		}
+
+		/**
+		 *    Uses reflection to run every method within itself
+		 *    starting with the string "test" unless a method
+		 *    is specified.
+		 *    @param SimpleReporter $reporter    Current test reporter.
+		 *    @access public
+		 */
+		function run($reporter) {
+			$reporter->paintCaseStart($this->getLabel());
+			$this->_runner = $this->_createRunner($reporter);
+			$this->_runner->run();
+			$reporter->paintCaseEnd($this->getLabel());
+			return $reporter->getStatus();
+		}
+
+		/**
+		 *    Sets up unit test wide variables at the start
+		 *    of each test method. To be overridden in
+		 *    actual user test cases.
+		 *    @access public
+		 */
+		function setUp() {
+		}
+
+		/**
+		 *    Clears the data set in the setUp() method call.
+		 *    To be overridden by the user in actual user test cases.
+		 *    @access public
+		 */
+		function tearDown() {
+		}
+
+		/**
+		 *    Sends a pass event with a message.
+		 *    @param string $message        Message to send.
+		 *    @access public
+		 */
+		function pass($message = "Pass") {
+			$this->_runner->paintPass($message . $this->getAssertionLine(' at line [%d]'));
+		}
+
+		/**
+		 *    Sends a fail event with a message.
+		 *    @param string $message        Message to send.
+		 *    @access public
+		 */
+		function fail($message = "Fail") {
+			$this->_runner->paintFail($message . $this->getAssertionLine(' at line [%d]'));
+		}
+
+		/**
+		 *    Formats a PHP error and dispatches it to the
+		 *    runner.
+		 *    @param integer $severity  PHP error code.
+		 *    @param string $message    Text of error.
+		 *    @param string $file       File error occoured in.
+		 *    @param integer $line      Line number of error.
+		 *    @param hash $globals      PHP super global arrays.
+		 *    @access public
+		 */
+		function error($severity, $message, $file, $line, $globals) {
+			$severity = SimpleErrorQueue::getSeverityAsString($severity);
+			$this->_runner->paintError(
+					"Unexpected PHP error [$message] severity [$severity] in [$file] line [$line]");
+		}
+
+		/**
+		 *    Sends a user defined event to the test runner.
+		 *    This is for small scale extension where
+		 *    both the test case and either the runner or
+		 *    display are subclassed.
+		 *    @param string $type       Type of event.
+		 *    @param mixed $payload     Object or message to deliver.
+		 *    @access public
+		 */
+		function signal($type, $payload) {
+			$this->_runner->paintSignal($type, $payload);
+		}
+
+		/**
+		 *    Cancels any outstanding errors.
+		 *    @access public
+		 */
+		function swallowErrors() {
+			$queue = SimpleErrorQueue::instance();
+			$queue->clear();
+		}
+
+		/**
+		 *    Runs an expectation directly, for extending the
+		 *    tests with new expectation classes.
+		 *    @param SimpleExpectation $expectation  Expectation subclass.
+		 *    @param mixed $test_value               Value to compare.
+		 *    @param string $message                 Message to display.
+		 *    @return boolean                        True on pass
+		 *    @access public
+		 */
+		function assertExpectation($expectation, $test_value, $message = '%s') {
+			return $this->assertTrue(
+					$expectation->test($test_value),
+					sprintf($message, $expectation->overlayMessage($test_value)));
+		}
+
+		/**
+		 *    Called from within the test methods to register
+		 *    passes and failures.
+		 *    @param boolean $result    Pass on true.
+		 *    @param string $message    Message to display describing
+		 *                              the test state.
+		 *    @return boolean           True on pass
+		 *    @access public
+		 */
+		function assertTrue($result, $message = false) {
+			if (! $message) {
+				$message = 'True assertion got ' . ($result ? 'True' : 'False');
+			}
+			if ($result) {
+				$this->pass($message);
+				return true;
+			} else {
+				$this->fail($message);
+				return false;
+			}
+		}
+
+		/**
+		 *    Will be true on false and vice versa. False
+		 *    is the PHP definition of false, so that null,
+		 *    empty strings, zero and an empty array all count
+		 *    as false.
+		 *    @param boolean $result    Pass on false.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True on pass
+		 *    @access public
+		 */
+		function assertFalse($result, $message = false) {
+			if (! $message) {
+				$message = 'False assertion got ' . ($result ? 'True' : 'False');
+			}
+			return $this->assertTrue(! $result, $message);
+		}
+
+		/**
+		 *    Uses a stack trace to find the line of an assertion.
+		 *    @param string $format    String formatting.
+		 *    @param array $stack      Stack frames top most first. Only
+		 *                             needed if not using the PHP
+		 *                             backtrace function.
+		 *    @return string           Line number of first assert*
+		 *                             method embedded in format string.
+		 *    @access public
+		 */
+		function getAssertionLine($format = '%d', $stack = false) {
+			if ($stack === false) {
+				$stack = SimpleTestCompatibility::getStackTrace();
+			}
+			return SimpleDumper::getFormattedAssertionLine($stack, $format);
+		}
+
+		/**
+		 *    Sends a formatted dump of a variable to the
+		 *    test suite for those emergency debugging
+		 *    situations.
+		 *    @param mixed $variable    Variable to display.
+		 *    @param string $message    Message to display.
+		 *    @return mixed             The original variable.
+		 *    @access public
+		 */
+		function dump($variable, $message = false) {
+			$formatted = SimpleDumper::dump($variable);
+			if ($message) {
+				$formatted = $message . "\n" . $formatted;
+			}
+			$this->_runner->paintFormattedMessage($formatted);
+			return $variable;
+		}
+
+		/**
+		 *    Dispatches a text message straight to the
+		 *    test suite. Useful for status bar displays.
+		 *    @param string $message        Message to show.
+		 *    @access public
+		 */
+		function sendMessage($message) {
+			$this->_runner->PaintMessage($message);
+		}
+
+		/**
+		 *    Accessor for the number of subtests.
+		 *    @return integer           Number of test cases.
+		 *    @access public
+		 *    @static
+		 */
+		static function getSize() {
+			return 1;
+		}
+	}
+
+	/**
+	 *    This is a composite test class for combining
+	 *    test cases and other RunnableTest classes into
+	 *    a group test.
 	 *    @package		SimpleTest
 	 *    @subpackage	UnitTester
-     */
-    class GroupTest {
-        protected $_label;
-        protected $_test_cases;
-        protected $_old_track_errors;
-        protected $_xdebug_is_enabled;
-
-        /**
-         *    Sets the name of the test suite.
-         *    @param string $label    Name sent at the start and end
-         *                            of the test.
-         *    @access public
-         */
-        function GroupTest($label) {
-            $this->_label = $label;
-            $this->_test_cases = array();
-            $this->_old_track_errors = ini_get('track_errors');
-            $this->_xdebug_is_enabled = function_exists('xdebug_is_enabled') ?
-                    xdebug_is_enabled() : false;
-        }
-
-        /**
-         *    Accessor for the test name for subclasses.
-         *    @return string           Name of the test.
-         *    @access public
-         */
-        function getLabel() {
-            return $this->_label;
-        }
-
-        /**
-         *    Adds a test into the suite. Can be either a group
-         *    test or some other unit test.
-         *    @param SimpleTestCase $test_case  Suite or individual test
-         *                                      case implementing the
-         *                                      runnable test interface.
-         *    @access public
-         */
-        function addTestCase($test_case) {
-            $this->_test_cases[] = $test_case;
-        }
-
-        /**
-         *    Adds a test into the suite by class name. The class will
-         *    be instantiated as needed.
-         *    @param SimpleTestCase $test_case  Suite or individual test
-         *                                      case implementing the
-         *                                      runnable test interface.
-         *    @access public
-         */
-        function addTestClass($class) {
-            $this->_test_cases[] = $class;
-        }
-
-        /**
-         *    Builds a group test from a library of test cases.
-         *    The new group is composed into this one.
-         *    @param string $test_file        File name of library with
-         *                                    test case classes.
-         *    @access public
-         */
-        function addTestFile($test_file) {
-            $existing_classes = get_declared_classes();
-            if ($error = $this->_requireWithError($test_file)) {
-                $this->addTestCase(new BadGroupTest($test_file, $error));
-                return;
-            }
-            $classes = $this->_selectRunnableTests($existing_classes, get_declared_classes());
-            if (count($classes) == 0) {
-                $this->addTestCase(new BadGroupTest($test_file, 'No new test cases'));
-                return;
-            }
-            $this->addTestCase($this->_createGroupFromClasses($test_file, $classes));
-        }
-
-        /**
-         *    Requires a source file recording any syntax errors.
-         *    @param string $file        File name to require in.
-         *    @return string/boolean     An error message on failure or false
-         *                               if no errors.
-         *    @access private
-         */
-        function _requireWithError($file) {
-            $this->_enableErrorReporting();
-            include($file);
-            $error = isset($php_errormsg) ? $php_errormsg : false;
-            $this->_disableErrorReporting();
-            $self_inflicted = array(
-                    'Assigning the return value of new by reference is deprecated',
-                    'var: Deprecated. Please use the public/private/protected modifiers');
-            if (in_array($error, $self_inflicted)) {
-                return false;
-            }
-            return $error;
-        }
-
-        /**
-         *    Sets up detection of parse errors. Note that XDebug
-         *    interferes with this and has to be disabled. This is
-         *    to make sure the correct error code is returned
-         *    from unattended scripts.
-         *    @access private
-         */
-        function _enableErrorReporting() {
-            if ($this->_xdebug_is_enabled) {
-                xdebug_disable();
-            }
-            ini_set('track_errors', true);
-        }
-
-        /**
-         *    Resets detection of parse errors to their old values.
-         *    This is to make sure the correct error code is returned
-         *    from unattended scripts.
-         *    @access private
-         */
-        function _disableErrorReporting() {
-            ini_set('track_errors', $this->_old_track_errors);
-            if ($this->_xdebug_is_enabled) {
-                xdebug_enable();
-            }
-        }
-
-        /**
-         *    Calculates the incoming test cases from a before
-         *    and after list of loaded classes.
-         *    @param array $existing_classes   Classes before require().
-         *    @param array $new_classes        Classes after require().
-         *    @return array                    New classes which are test
-         *                                     cases that shouldn't be ignored.
-         *    @access private
-         */
-        function _selectRunnableTests($existing_classes, $new_classes) {
-            $classes = array();
-            foreach ($new_classes as $class) {
-                if (in_array($class, $existing_classes)) {
-                    continue;
-                }
-                if (! $this->_isTestCase($class)) {
-                    continue;
-                }
-                $classes[] = $class;
-            }
-            return $classes;
-        }
-
-        /**
-         *    Builds a group test from a class list.
-         *    @param string $title       Title of new group.
-         *    @param array $classes      Test classes.
-         *    @return GroupTest          Group loaded with the new
-         *                               test cases.
-         *    @access private
-         */
-        function _createGroupFromClasses($title, $classes) {
-            $group = new GroupTest($title);
-            foreach ($classes as $class) {
-                if (SimpleTestOptions::isIgnored($class)) {
-                    continue;
-                }
-                $group->addTestClass($class);
-            }
-            return $group;
-        }
-
-        /**
-         *    Test to see if a class is derived from the
-         *    TestCase class.
-         *    @param string $class            Class name.
-         *    @access private
-         */
-        function _isTestCase($class) {
-            while ($class = get_parent_class($class)) {
-                $class = strtolower($class);
-                if ($class == "simpletestcase" || $class == "grouptest") {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         *    Invokes run() on all of the held test cases, instantiating
-         *    them if necessary.
-         *    @param SimpleReporter $reporter    Current test reporter.
-         *    @access public
-         */
-        function run($reporter) {
-            $reporter->paintGroupStart($this->getLabel(), $this->getSize());
-            for ($i = 0, $count = count($this->_test_cases); $i < $count; $i++) {
-                if (is_string($this->_test_cases[$i])) {
-                    $class = $this->_test_cases[$i];
-                    $test = new $class();
-                    $test->run($reporter);
-                } else {
-                    $this->_test_cases[$i]->run($reporter);
-                }
-            }
-            $reporter->paintGroupEnd($this->getLabel());
-            return $reporter->getStatus();
-        }
-
-        /**
-         *    Number of contained test cases.
-         *    @return integer     Total count of cases in the group.
-         *    @access public
-         */
-        function getSize() {
-            $count = 0;
-            foreach ($this->_test_cases as $case) {
-                if (is_string($case)) {
-                    $count++;
-                } else {
-                    $count += $case->getSize();
-                }
-            }
-            return $count;
-        }
-    }
-
-    /**
-     *    This is a failing group test for when a test suite hasn't
-     *    loaded properly.
+	 */
+	class GroupTest {
+		protected $_label;
+		protected $_test_cases;
+		protected $_old_track_errors;
+		protected $_xdebug_is_enabled;
+
+		/**
+		 *    Sets the name of the test suite.
+		 *    @param string $label    Name sent at the start and end
+		 *                            of the test.
+		 *    @access public
+		 */
+		function GroupTest($label) {
+			$this->_label = $label;
+			$this->_test_cases = array();
+			$this->_old_track_errors = ini_get('track_errors');
+			$this->_xdebug_is_enabled = function_exists('xdebug_is_enabled') ?
+					xdebug_is_enabled() : false;
+		}
+
+		/**
+		 *    Accessor for the test name for subclasses.
+		 *    @return string           Name of the test.
+		 *    @access public
+		 */
+		function getLabel() {
+			return $this->_label;
+		}
+
+		/**
+		 *    Adds a test into the suite. Can be either a group
+		 *    test or some other unit test.
+		 *    @param SimpleTestCase $test_case  Suite or individual test
+		 *                                      case implementing the
+		 *                                      runnable test interface.
+		 *    @access public
+		 */
+		function addTestCase($test_case) {
+			$this->_test_cases[] = $test_case;
+		}
+
+		/**
+		 *    Adds a test into the suite by class name. The class will
+		 *    be instantiated as needed.
+		 *    @param SimpleTestCase $test_case  Suite or individual test
+		 *                                      case implementing the
+		 *                                      runnable test interface.
+		 *    @access public
+		 */
+		function addTestClass($class) {
+			$this->_test_cases[] = $class;
+		}
+
+		/**
+		 *    Builds a group test from a library of test cases.
+		 *    The new group is composed into this one.
+		 *    @param string $test_file        File name of library with
+		 *                                    test case classes.
+		 *    @access public
+		 */
+		function addTestFile($test_file) {
+			$existing_classes = get_declared_classes();
+			if ($error = $this->_requireWithError($test_file)) {
+				$this->addTestCase(new BadGroupTest($test_file, $error));
+				return;
+			}
+			$classes = $this->_selectRunnableTests($existing_classes, get_declared_classes());
+			if (count($classes) == 0) {
+				$this->addTestCase(new BadGroupTest($test_file, 'No new test cases'));
+				return;
+			}
+			$this->addTestCase($this->_createGroupFromClasses($test_file, $classes));
+		}
+
+		/**
+		 *    Requires a source file recording any syntax errors.
+		 *    @param string $file        File name to require in.
+		 *    @return string/boolean     An error message on failure or false
+		 *                               if no errors.
+		 *    @access private
+		 */
+		function _requireWithError($file) {
+			$this->_enableErrorReporting();
+			include($file);
+			$error = isset($php_errormsg) ? $php_errormsg : false;
+			$this->_disableErrorReporting();
+			$self_inflicted = array(
+					'Assigning the return value of new by reference is deprecated',
+					'var: Deprecated. Please use the public/private/protected modifiers');
+			if (in_array($error, $self_inflicted)) {
+				return false;
+			}
+			return $error;
+		}
+
+		/**
+		 *    Sets up detection of parse errors. Note that XDebug
+		 *    interferes with this and has to be disabled. This is
+		 *    to make sure the correct error code is returned
+		 *    from unattended scripts.
+		 *    @access private
+		 */
+		function _enableErrorReporting() {
+			if ($this->_xdebug_is_enabled) {
+				xdebug_disable();
+			}
+			ini_set('track_errors', true);
+		}
+
+		/**
+		 *    Resets detection of parse errors to their old values.
+		 *    This is to make sure the correct error code is returned
+		 *    from unattended scripts.
+		 *    @access private
+		 */
+		function _disableErrorReporting() {
+			ini_set('track_errors', $this->_old_track_errors);
+			if ($this->_xdebug_is_enabled) {
+				xdebug_enable();
+			}
+		}
+
+		/**
+		 *    Calculates the incoming test cases from a before
+		 *    and after list of loaded classes.
+		 *    @param array $existing_classes   Classes before require().
+		 *    @param array $new_classes        Classes after require().
+		 *    @return array                    New classes which are test
+		 *                                     cases that shouldn't be ignored.
+		 *    @access private
+		 */
+		function _selectRunnableTests($existing_classes, $new_classes) {
+			$classes = array();
+			foreach ($new_classes as $class) {
+				if (in_array($class, $existing_classes)) {
+					continue;
+				}
+				if (! $this->_isTestCase($class)) {
+					continue;
+				}
+				$classes[] = $class;
+			}
+			return $classes;
+		}
+
+		/**
+		 *    Builds a group test from a class list.
+		 *    @param string $title       Title of new group.
+		 *    @param array $classes      Test classes.
+		 *    @return GroupTest          Group loaded with the new
+		 *                               test cases.
+		 *    @access private
+		 */
+		function _createGroupFromClasses($title, $classes) {
+			$group = new GroupTest($title);
+			foreach ($classes as $class) {
+				if (SimpleTestOptions::isIgnored($class)) {
+					continue;
+				}
+				$group->addTestClass($class);
+			}
+			return $group;
+		}
+
+		/**
+		 *    Test to see if a class is derived from the
+		 *    TestCase class.
+		 *    @param string $class            Class name.
+		 *    @access private
+		 */
+		function _isTestCase($class) {
+			while ($class = get_parent_class($class)) {
+				$class = strtolower($class);
+				if ($class == "simpletestcase" || $class == "grouptest") {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 *    Invokes run() on all of the held test cases, instantiating
+		 *    them if necessary.
+		 *    @param SimpleReporter $reporter    Current test reporter.
+		 *    @access public
+		 */
+		function run($reporter) {
+			$reporter->paintGroupStart($this->getLabel(), $this->getSize());
+			for ($i = 0, $count = count($this->_test_cases); $i < $count; $i++) {
+				if (is_string($this->_test_cases[$i])) {
+					$class = $this->_test_cases[$i];
+					$test = new $class();
+					$test->run($reporter);
+				} else {
+					$this->_test_cases[$i]->run($reporter);
+				}
+			}
+			$reporter->paintGroupEnd($this->getLabel());
+			return $reporter->getStatus();
+		}
+
+		/**
+		 *    Number of contained test cases.
+		 *    @return integer     Total count of cases in the group.
+		 *    @access public
+		 */
+		function getSize() {
+			$count = 0;
+			foreach ($this->_test_cases as $case) {
+				if (is_string($case)) {
+					$count++;
+				} else {
+					$count += $case->getSize();
+				}
+			}
+			return $count;
+		}
+	}
+
+	/**
+	 *    This is a failing group test for when a test suite hasn't
+	 *    loaded properly.
 	 *    @package		SimpleTest
 	 *    @subpackage	UnitTester
-     */
-    class BadGroupTest {
-        protected $_label;
-        protected $_error;
-
-        /**
-         *    Sets the name of the test suite and error message.
-         *    @param string $label    Name sent at the start and end
-         *                            of the test.
-         *    @access public
-         */
-        function BadGroupTest($label, $error) {
-            $this->_label = $label;
-            $this->_error = $error;
-        }
-
-        /**
-         *    Accessor for the test name for subclasses.
-         *    @return string           Name of the test.
-         *    @access public
-         */
-        function getLabel() {
-            return $this->_label;
-        }
-
-        /**
-         *    Sends a single error to the reporter.
-         *    @param SimpleReporter $reporter    Current test reporter.
-         *    @access public
-         */
-        function run($reporter) {
-            $reporter->paintGroupStart($this->getLabel(), $this->getSize());
-            $reporter->paintFail('Bad GroupTest [' . $this->getLabel() .
-                    '] with error [' . $this->_error . ']');
-            $reporter->paintGroupEnd($this->getLabel());
-            return $reporter->getStatus();
-        }
-
-        /**
-         *    Number of contained test cases. Always zero.
-         *    @return integer     Total count of cases in the group.
-         *    @access public
-         */
-        function getSize() {
-            return 0;
-        }
-    }
+	 */
+	class BadGroupTest {
+		protected $_label;
+		protected $_error;
+
+		/**
+		 *    Sets the name of the test suite and error message.
+		 *    @param string $label    Name sent at the start and end
+		 *                            of the test.
+		 *    @access public
+		 */
+		function BadGroupTest($label, $error) {
+			$this->_label = $label;
+			$this->_error = $error;
+		}
+
+		/**
+		 *    Accessor for the test name for subclasses.
+		 *    @return string           Name of the test.
+		 *    @access public
+		 */
+		function getLabel() {
+			return $this->_label;
+		}
+
+		/**
+		 *    Sends a single error to the reporter.
+		 *    @param SimpleReporter $reporter    Current test reporter.
+		 *    @access public
+		 */
+		function run($reporter) {
+			$reporter->paintGroupStart($this->getLabel(), $this->getSize());
+			$reporter->paintFail('Bad GroupTest [' . $this->getLabel() .
+					'] with error [' . $this->_error . ']');
+			$reporter->paintGroupEnd($this->getLabel());
+			return $reporter->getStatus();
+		}
+
+		/**
+		 *    Number of contained test cases. Always zero.
+		 *    @return integer     Total count of cases in the group.
+		 *    @access public
+		 */
+		function getSize() {
+			return 0;
+		}
+	}

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
     require_once(dirname(__FILE__) . '/scorer.php');
     require_once(dirname(__FILE__) . '/expectation.php');
     require_once(dirname(__FILE__) . '/dumper.php');
-    if (! defined('SIMPLE_TEST')) {
+    if (!defined('SIMPLE_TEST')) {
         define('SIMPLE_TEST', dirname(__FILE__) . '/');
     }
     /**#@-*/
@@ -187,7 +187,7 @@ 
          *    @access public
          */
         function assertTrue($result, $message = false) {
-            if (! $message) {
+            if (!$message) {
                 $message = 'True assertion got ' . ($result ? 'True' : 'False');
             }
             if ($result) {
@@ -210,10 +210,10 @@ 
          *    @access public
          */
         function assertFalse($result, $message = false) {
-            if (! $message) {
+            if (!$message) {
                 $message = 'False assertion got ' . ($result ? 'True' : 'False');
             }
-            return $this->assertTrue(! $result, $message);
+            return $this->assertTrue(!$result, $message);
         }
 
         /**
@@ -416,7 +416,7 @@ 
                 if (in_array($class, $existing_classes)) {
                     continue;
                 }
-                if (! $this->_isTestCase($class)) {
+                if (!$this->_isTestCase($class)) {
                     continue;
                 }
                 $classes[] = $class;