pradosoft / prado

tests/test_tools/simpletest/xml.php

Indentation +597 added lines, -597 removed lines

@@ -1,613 +1,613 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	UnitTester
-     *	@version	$Id: xml.php 1398 2006-09-08 19:31:03Z xue $
-     */
-
-    /**#@+
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	UnitTester
+	 *	@version	$Id: xml.php 1398 2006-09-08 19:31:03Z xue $
+	 */
+
+	/**#@+
      *	include other SimpleTest class files
      */
-    require_once(dirname(__FILE__) . '/scorer.php');
-    /**#@-*/
+	require_once(dirname(__FILE__) . '/scorer.php');
+	/**#@-*/
 
-    /**
-     *    Creates the XML needed for remote communication
-     *    by SimpleTest.
+	/**
+	 *    Creates the XML needed for remote communication
+	 *    by SimpleTest.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class XmlReporter extends SimpleReporter {
-        protected $_indent;
-        protected $_namespace;
-
-        /**
-         *    Does nothing yet.
-         *    @access public
-         */
-        function XmlReporter($namespace = false, $indent = '  ') {
-            $this->SimpleReporter();
-            $this->_namespace = ($namespace ? $namespace . ':' : '');
-            $this->_indent = $indent;
-        }
-
-        /**
-         *    Calculates the pretty printing indent level
-         *    from the current level of nesting.
-         *    @param integer $offset  Extra indenting level.
-         *    @return string          Leading space.
-         *    @access protected
-         */
-        function _getIndent($offset = 0) {
-            return str_repeat(
-                    $this->_indent,
-                    count($this->getTestList()) + $offset);
-        }
-
-        /**
-         *    Converts character string to parsed XML
-         *    entities string.
-         *    @param string text        Unparsed character data.
-         *    @return string            Parsed character data.
-         *    @access public
-         */
-        function toParsedXml($text) {
-            return str_replace(
-                    array('&', '<', '>', '"', '\''),
-                    array('&amp;', '&lt;', '&gt;', '&quot;', '&apos;'),
-                    $text);
-        }
-
-        /**
-         *    Paints the start of a group test.
-         *    @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) {
-            parent::paintGroupStart($test_name, $size);
-            print $this->_getIndent();
-            print "<" . $this->_namespace . "group size=\"$size\">\n";
-            print $this->_getIndent(1);
-            print "<" . $this->_namespace . "name>" .
-                    $this->toParsedXml($test_name) .
-                    "</" . $this->_namespace . "name>\n";
-        }
-
-        /**
-         *    Paints the end of a group test.
-         *    @param string $test_name   Name of test that is ending.
-         *    @access public
-         */
-        function paintGroupEnd($test_name) {
-            print $this->_getIndent();
-            print "</" . $this->_namespace . "group>\n";
-            parent::paintGroupEnd($test_name);
-        }
-
-        /**
-         *    Paints the start of a test case.
-         *    @param string $test_name   Name of test that is starting.
-         *    @access public
-         */
-        function paintCaseStart($test_name) {
-            parent::paintCaseStart($test_name);
-            print $this->_getIndent();
-            print "<" . $this->_namespace . "case>\n";
-            print $this->_getIndent(1);
-            print "<" . $this->_namespace . "name>" .
-                    $this->toParsedXml($test_name) .
-                    "</" . $this->_namespace . "name>\n";
-        }
-
-        /**
-         *    Paints the end of a test case.
-         *    @param string $test_name   Name of test that is ending.
-         *    @access public
-         */
-        function paintCaseEnd($test_name) {
-            print $this->_getIndent();
-            print "</" . $this->_namespace . "case>\n";
-            parent::paintCaseEnd($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) {
-            parent::paintMethodStart($test_name);
-            print $this->_getIndent();
-            print "<" . $this->_namespace . "test>\n";
-            print $this->_getIndent(1);
-            print "<" . $this->_namespace . "name>" .
-                    $this->toParsedXml($test_name) .
-                    "</" . $this->_namespace . "name>\n";
-        }
-
-        /**
-         *    Paints the end of a test method.
-         *    @param string $test_name   Name of test that is ending.
-         *    @param integer $progress   Number of test cases ending.
-         *    @access public
-         */
-        function paintMethodEnd($test_name) {
-            print $this->_getIndent();
-            print "</" . $this->_namespace . "test>\n";
-            parent::paintMethodEnd($test_name);
-        }
-
-        /**
-         *    Increments the pass count.
-         *    @param string $message        Message is ignored.
-         *    @access public
-         */
-        function paintPass($message) {
-            parent::paintPass($message);
-            print $this->_getIndent(1);
-            print "<" . $this->_namespace . "pass>";
-            print $this->toParsedXml($message);
-            print "</" . $this->_namespace . "pass>\n";
-        }
-
-        /**
-         *    Increments the fail count.
-         *    @param string $message        Message is ignored.
-         *    @access public
-         */
-        function paintFail($message) {
-            parent::paintFail($message);
-            print $this->_getIndent(1);
-            print "<" . $this->_namespace . "fail>";
-            print $this->toParsedXml($message);
-            print "</" . $this->_namespace . "fail>\n";
-        }
-
-        /**
-         *    Paints a PHP error or exception.
-         *    @param string $message        Message is ignored.
-         *    @access public
-         *    @abstract
-         */
-        function paintError($message) {
-            parent::paintError($message);
-            print $this->_getIndent(1);
-            print "<" . $this->_namespace . "exception>";
-            print $this->toParsedXml($message);
-            print "</" . $this->_namespace . "exception>\n";
-        }
-
-        /**
-         *    Paints a simple supplementary message.
-         *    @param string $message        Text to display.
-         *    @access public
-         */
-        function paintMessage($message) {
-            parent::paintMessage($message);
-            print $this->_getIndent(1);
-            print "<" . $this->_namespace . "message>";
-            print $this->toParsedXml($message);
-            print "</" . $this->_namespace . "message>\n";
-        }
-
-        /**
-         *    Paints a formatted ASCII message such as a
-         *    variable dump.
-         *    @param string $message        Text to display.
-         *    @access public
-         */
-        function paintFormattedMessage($message) {
-            parent::paintFormattedMessage($message);
-            print $this->_getIndent(1);
-            print "<" . $this->_namespace . "formatted>";
-            print "<![CDATA[$message]]>";
-            print "</" . $this->_namespace . "formatted>\n";
-        }
-
-        /**
-         *    Serialises the event object.
-         *    @param string $type        Event type as text.
-         *    @param mixed $payload      Message or object.
-         *    @access public
-         */
-        function paintSignal($type, $payload) {
-            parent::paintSignal($type, $payload);
-            print $this->_getIndent(1);
-            print "<" . $this->_namespace . "signal type=\"$type\">";
-            print "<![CDATA[" . serialize($payload) . "]]>";
-            print "</" . $this->_namespace . "signal>\n";
-        }
-
-        /**
-         *    Paints the test document header.
-         *    @param string $test_name     First test top level
-         *                                 to start.
-         *    @access public
-         *    @abstract
-         */
-        function paintHeader($test_name) {
-            if (! SimpleReporter::inCli()) {
-                header('Content-type: text/xml');
-            }
-            print "<?xml version=\"1.0\"";
-            if ($this->_namespace) {
-                print " xmlns:" . $this->_namespace .
-                        "=\"www.lastcraft.com/SimpleTest/Beta3/Report\"";
-            }
-            print "?>\n";
-            print "<" . $this->_namespace . "run>\n";
-        }
-
-        /**
-         *    Paints the test document footer.
-         *    @param string $test_name        The top level test.
-         *    @access public
-         *    @abstract
-         */
-        function paintFooter($test_name) {
-            print "</" . $this->_namespace . "run>\n";
-        }
-    }
-
-    /**
-     *    Accumulator for incoming tag. Holds the
-     *    incoming test structure information for
-     *    later dispatch to the reporter.
+	 */
+	class XmlReporter extends SimpleReporter {
+		protected $_indent;
+		protected $_namespace;
+
+		/**
+		 *    Does nothing yet.
+		 *    @access public
+		 */
+		function XmlReporter($namespace = false, $indent = '  ') {
+			$this->SimpleReporter();
+			$this->_namespace = ($namespace ? $namespace . ':' : '');
+			$this->_indent = $indent;
+		}
+
+		/**
+		 *    Calculates the pretty printing indent level
+		 *    from the current level of nesting.
+		 *    @param integer $offset  Extra indenting level.
+		 *    @return string          Leading space.
+		 *    @access protected
+		 */
+		function _getIndent($offset = 0) {
+			return str_repeat(
+					$this->_indent,
+					count($this->getTestList()) + $offset);
+		}
+
+		/**
+		 *    Converts character string to parsed XML
+		 *    entities string.
+		 *    @param string text        Unparsed character data.
+		 *    @return string            Parsed character data.
+		 *    @access public
+		 */
+		function toParsedXml($text) {
+			return str_replace(
+					array('&', '<', '>', '"', '\''),
+					array('&amp;', '&lt;', '&gt;', '&quot;', '&apos;'),
+					$text);
+		}
+
+		/**
+		 *    Paints the start of a group test.
+		 *    @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) {
+			parent::paintGroupStart($test_name, $size);
+			print $this->_getIndent();
+			print "<" . $this->_namespace . "group size=\"$size\">\n";
+			print $this->_getIndent(1);
+			print "<" . $this->_namespace . "name>" .
+					$this->toParsedXml($test_name) .
+					"</" . $this->_namespace . "name>\n";
+		}
+
+		/**
+		 *    Paints the end of a group test.
+		 *    @param string $test_name   Name of test that is ending.
+		 *    @access public
+		 */
+		function paintGroupEnd($test_name) {
+			print $this->_getIndent();
+			print "</" . $this->_namespace . "group>\n";
+			parent::paintGroupEnd($test_name);
+		}
+
+		/**
+		 *    Paints the start of a test case.
+		 *    @param string $test_name   Name of test that is starting.
+		 *    @access public
+		 */
+		function paintCaseStart($test_name) {
+			parent::paintCaseStart($test_name);
+			print $this->_getIndent();
+			print "<" . $this->_namespace . "case>\n";
+			print $this->_getIndent(1);
+			print "<" . $this->_namespace . "name>" .
+					$this->toParsedXml($test_name) .
+					"</" . $this->_namespace . "name>\n";
+		}
+
+		/**
+		 *    Paints the end of a test case.
+		 *    @param string $test_name   Name of test that is ending.
+		 *    @access public
+		 */
+		function paintCaseEnd($test_name) {
+			print $this->_getIndent();
+			print "</" . $this->_namespace . "case>\n";
+			parent::paintCaseEnd($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) {
+			parent::paintMethodStart($test_name);
+			print $this->_getIndent();
+			print "<" . $this->_namespace . "test>\n";
+			print $this->_getIndent(1);
+			print "<" . $this->_namespace . "name>" .
+					$this->toParsedXml($test_name) .
+					"</" . $this->_namespace . "name>\n";
+		}
+
+		/**
+		 *    Paints the end of a test method.
+		 *    @param string $test_name   Name of test that is ending.
+		 *    @param integer $progress   Number of test cases ending.
+		 *    @access public
+		 */
+		function paintMethodEnd($test_name) {
+			print $this->_getIndent();
+			print "</" . $this->_namespace . "test>\n";
+			parent::paintMethodEnd($test_name);
+		}
+
+		/**
+		 *    Increments the pass count.
+		 *    @param string $message        Message is ignored.
+		 *    @access public
+		 */
+		function paintPass($message) {
+			parent::paintPass($message);
+			print $this->_getIndent(1);
+			print "<" . $this->_namespace . "pass>";
+			print $this->toParsedXml($message);
+			print "</" . $this->_namespace . "pass>\n";
+		}
+
+		/**
+		 *    Increments the fail count.
+		 *    @param string $message        Message is ignored.
+		 *    @access public
+		 */
+		function paintFail($message) {
+			parent::paintFail($message);
+			print $this->_getIndent(1);
+			print "<" . $this->_namespace . "fail>";
+			print $this->toParsedXml($message);
+			print "</" . $this->_namespace . "fail>\n";
+		}
+
+		/**
+		 *    Paints a PHP error or exception.
+		 *    @param string $message        Message is ignored.
+		 *    @access public
+		 *    @abstract
+		 */
+		function paintError($message) {
+			parent::paintError($message);
+			print $this->_getIndent(1);
+			print "<" . $this->_namespace . "exception>";
+			print $this->toParsedXml($message);
+			print "</" . $this->_namespace . "exception>\n";
+		}
+
+		/**
+		 *    Paints a simple supplementary message.
+		 *    @param string $message        Text to display.
+		 *    @access public
+		 */
+		function paintMessage($message) {
+			parent::paintMessage($message);
+			print $this->_getIndent(1);
+			print "<" . $this->_namespace . "message>";
+			print $this->toParsedXml($message);
+			print "</" . $this->_namespace . "message>\n";
+		}
+
+		/**
+		 *    Paints a formatted ASCII message such as a
+		 *    variable dump.
+		 *    @param string $message        Text to display.
+		 *    @access public
+		 */
+		function paintFormattedMessage($message) {
+			parent::paintFormattedMessage($message);
+			print $this->_getIndent(1);
+			print "<" . $this->_namespace . "formatted>";
+			print "<![CDATA[$message]]>";
+			print "</" . $this->_namespace . "formatted>\n";
+		}
+
+		/**
+		 *    Serialises the event object.
+		 *    @param string $type        Event type as text.
+		 *    @param mixed $payload      Message or object.
+		 *    @access public
+		 */
+		function paintSignal($type, $payload) {
+			parent::paintSignal($type, $payload);
+			print $this->_getIndent(1);
+			print "<" . $this->_namespace . "signal type=\"$type\">";
+			print "<![CDATA[" . serialize($payload) . "]]>";
+			print "</" . $this->_namespace . "signal>\n";
+		}
+
+		/**
+		 *    Paints the test document header.
+		 *    @param string $test_name     First test top level
+		 *                                 to start.
+		 *    @access public
+		 *    @abstract
+		 */
+		function paintHeader($test_name) {
+			if (! SimpleReporter::inCli()) {
+				header('Content-type: text/xml');
+			}
+			print "<?xml version=\"1.0\"";
+			if ($this->_namespace) {
+				print " xmlns:" . $this->_namespace .
+						"=\"www.lastcraft.com/SimpleTest/Beta3/Report\"";
+			}
+			print "?>\n";
+			print "<" . $this->_namespace . "run>\n";
+		}
+
+		/**
+		 *    Paints the test document footer.
+		 *    @param string $test_name        The top level test.
+		 *    @access public
+		 *    @abstract
+		 */
+		function paintFooter($test_name) {
+			print "</" . $this->_namespace . "run>\n";
+		}
+	}
+
+	/**
+	 *    Accumulator for incoming tag. Holds the
+	 *    incoming test structure information for
+	 *    later dispatch to the reporter.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class NestingXmlTag {
-        protected $_name;
-        protected $_attributes;
-
-        /**
-         *    Sets the basic test information except
-         *    the name.
-         *    @param hash $attributes   Name value pairs.
-         *    @access public
-         */
-        function NestingXmlTag($attributes) {
-            $this->_name = false;
-            $this->_attributes = $attributes;
-        }
-
-        /**
-         *    Sets the test case/method name.
-         *    @param string $name        Name of test.
-         *    @access public
-         */
-        function setName($name) {
-            $this->_name = $name;
-        }
-
-        /**
-         *    Accessor for name.
-         *    @return string        Name of test.
-         *    @access public
-         */
-        function getName() {
-            return $this->_name;
-        }
-
-        /**
-         *    Accessor for attributes.
-         *    @return hash        All attributes.
-         *    @access protected
-         */
-        function _getAttributes() {
-            return $this->_attributes;
-        }
-    }
-
-    /**
-     *    Accumulator for incoming method tag. Holds the
-     *    incoming test structure information for
-     *    later dispatch to the reporter.
+	 */
+	class NestingXmlTag {
+		protected $_name;
+		protected $_attributes;
+
+		/**
+		 *    Sets the basic test information except
+		 *    the name.
+		 *    @param hash $attributes   Name value pairs.
+		 *    @access public
+		 */
+		function NestingXmlTag($attributes) {
+			$this->_name = false;
+			$this->_attributes = $attributes;
+		}
+
+		/**
+		 *    Sets the test case/method name.
+		 *    @param string $name        Name of test.
+		 *    @access public
+		 */
+		function setName($name) {
+			$this->_name = $name;
+		}
+
+		/**
+		 *    Accessor for name.
+		 *    @return string        Name of test.
+		 *    @access public
+		 */
+		function getName() {
+			return $this->_name;
+		}
+
+		/**
+		 *    Accessor for attributes.
+		 *    @return hash        All attributes.
+		 *    @access protected
+		 */
+		function _getAttributes() {
+			return $this->_attributes;
+		}
+	}
+
+	/**
+	 *    Accumulator for incoming method tag. Holds the
+	 *    incoming test structure information for
+	 *    later dispatch to the reporter.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class NestingMethodTag extends NestingXmlTag {
-
-        /**
-         *    Sets the basic test information except
-         *    the name.
-         *    @param hash $attributes   Name value pairs.
-         *    @access public
-         */
-        function NestingMethodTag($attributes) {
-            $this->NestingXmlTag($attributes);
-        }
-
-        /**
-         *    Signals the appropriate start event on the
-         *    listener.
-         *    @param SimpleReporter $listener    Target for events.
-         *    @access public
-         */
-        function paintStart($listener) {
-            $listener->paintMethodStart($this->getName());
-        }
-
-        /**
-         *    Signals the appropriate end event on the
-         *    listener.
-         *    @param SimpleReporter $listener    Target for events.
-         *    @access public
-         */
-        function paintEnd($listener) {
-            $listener->paintMethodEnd($this->getName());
-        }
-    }
-
-    /**
-     *    Accumulator for incoming case tag. Holds the
-     *    incoming test structure information for
-     *    later dispatch to the reporter.
+	 */
+	class NestingMethodTag extends NestingXmlTag {
+
+		/**
+		 *    Sets the basic test information except
+		 *    the name.
+		 *    @param hash $attributes   Name value pairs.
+		 *    @access public
+		 */
+		function NestingMethodTag($attributes) {
+			$this->NestingXmlTag($attributes);
+		}
+
+		/**
+		 *    Signals the appropriate start event on the
+		 *    listener.
+		 *    @param SimpleReporter $listener    Target for events.
+		 *    @access public
+		 */
+		function paintStart($listener) {
+			$listener->paintMethodStart($this->getName());
+		}
+
+		/**
+		 *    Signals the appropriate end event on the
+		 *    listener.
+		 *    @param SimpleReporter $listener    Target for events.
+		 *    @access public
+		 */
+		function paintEnd($listener) {
+			$listener->paintMethodEnd($this->getName());
+		}
+	}
+
+	/**
+	 *    Accumulator for incoming case tag. Holds the
+	 *    incoming test structure information for
+	 *    later dispatch to the reporter.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class NestingCaseTag extends NestingXmlTag {
-
-        /**
-         *    Sets the basic test information except
-         *    the name.
-         *    @param hash $attributes   Name value pairs.
-         *    @access public
-         */
-        function NestingCaseTag($attributes) {
-            $this->NestingXmlTag($attributes);
-        }
-
-        /**
-         *    Signals the appropriate start event on the
-         *    listener.
-         *    @param SimpleReporter $listener    Target for events.
-         *    @access public
-         */
-        function paintStart($listener) {
-            $listener->paintCaseStart($this->getName());
-        }
-
-        /**
-         *    Signals the appropriate end event on the
-         *    listener.
-         *    @param SimpleReporter $listener    Target for events.
-         *    @access public
-         */
-        function paintEnd($listener) {
-            $listener->paintCaseEnd($this->getName());
-        }
-    }
-
-    /**
-     *    Accumulator for incoming group tag. Holds the
-     *    incoming test structure information for
-     *    later dispatch to the reporter.
+	 */
+	class NestingCaseTag extends NestingXmlTag {
+
+		/**
+		 *    Sets the basic test information except
+		 *    the name.
+		 *    @param hash $attributes   Name value pairs.
+		 *    @access public
+		 */
+		function NestingCaseTag($attributes) {
+			$this->NestingXmlTag($attributes);
+		}
+
+		/**
+		 *    Signals the appropriate start event on the
+		 *    listener.
+		 *    @param SimpleReporter $listener    Target for events.
+		 *    @access public
+		 */
+		function paintStart($listener) {
+			$listener->paintCaseStart($this->getName());
+		}
+
+		/**
+		 *    Signals the appropriate end event on the
+		 *    listener.
+		 *    @param SimpleReporter $listener    Target for events.
+		 *    @access public
+		 */
+		function paintEnd($listener) {
+			$listener->paintCaseEnd($this->getName());
+		}
+	}
+
+	/**
+	 *    Accumulator for incoming group tag. Holds the
+	 *    incoming test structure information for
+	 *    later dispatch to the reporter.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class NestingGroupTag extends NestingXmlTag {
-
-        /**
-         *    Sets the basic test information except
-         *    the name.
-         *    @param hash $attributes   Name value pairs.
-         *    @access public
-         */
-        function NestingGroupTag($attributes) {
-            $this->NestingXmlTag($attributes);
-        }
-
-        /**
-         *    Signals the appropriate start event on the
-         *    listener.
-         *    @param SimpleReporter $listener    Target for events.
-         *    @access public
-         */
-        function paintStart($listener) {
-            $listener->paintGroupStart($this->getName(), $this->getSize());
-        }
-
-        /**
-         *    Signals the appropriate end event on the
-         *    listener.
-         *    @param SimpleReporter $listener    Target for events.
-         *    @access public
-         */
-        function paintEnd($listener) {
-            $listener->paintGroupEnd($this->getName());
-        }
-
-        /**
-         *    The size in the attributes.
-         *    @return integer     Value of size attribute or zero.
-         *    @access public
-         */
-        function getSize() {
-            $attributes = $this->_getAttributes();
-            if (isset($attributes['SIZE'])) {
-                return (integer)$attributes['SIZE'];
-            }
-            return 0;
-        }
-    }
-
-    /**
-     *    Parser for importing the output of the XmlReporter.
-     *    Dispatches that output to another reporter.
+	 */
+	class NestingGroupTag extends NestingXmlTag {
+
+		/**
+		 *    Sets the basic test information except
+		 *    the name.
+		 *    @param hash $attributes   Name value pairs.
+		 *    @access public
+		 */
+		function NestingGroupTag($attributes) {
+			$this->NestingXmlTag($attributes);
+		}
+
+		/**
+		 *    Signals the appropriate start event on the
+		 *    listener.
+		 *    @param SimpleReporter $listener    Target for events.
+		 *    @access public
+		 */
+		function paintStart($listener) {
+			$listener->paintGroupStart($this->getName(), $this->getSize());
+		}
+
+		/**
+		 *    Signals the appropriate end event on the
+		 *    listener.
+		 *    @param SimpleReporter $listener    Target for events.
+		 *    @access public
+		 */
+		function paintEnd($listener) {
+			$listener->paintGroupEnd($this->getName());
+		}
+
+		/**
+		 *    The size in the attributes.
+		 *    @return integer     Value of size attribute or zero.
+		 *    @access public
+		 */
+		function getSize() {
+			$attributes = $this->_getAttributes();
+			if (isset($attributes['SIZE'])) {
+				return (integer)$attributes['SIZE'];
+			}
+			return 0;
+		}
+	}
+
+	/**
+	 *    Parser for importing the output of the XmlReporter.
+	 *    Dispatches that output to another reporter.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class SimpleTestXmlParser {
-        protected $_listener;
-        protected $_expat;
-        protected $_tag_stack;
-        protected $_in_content_tag;
-        protected $_content;
-        protected $_attributes;
-
-        /**
-         *    Loads a listener with the SimpleReporter
-         *    interface.
-         *    @param SimpleReporter $listener   Listener of tag events.
-         *    @access public
-         */
-        function SimpleTestXmlParser($listener) {
-            $this->_listener = $listener;
-            $this->_expat = $this->_createParser();
-            $this->_tag_stack = array();
-            $this->_in_content_tag = false;
-            $this->_content = '';
-            $this->_attributes = array();
-        }
-
-        /**
-         *    Parses a block of XML sending the results to
-         *    the listener.
-         *    @param string $chunk        Block of text to read.
-         *    @return boolean             True if valid XML.
-         *    @access public
-         */
-        function parse($chunk) {
-            if (! xml_parse($this->_expat, $chunk)) {
-                trigger_error('XML parse error with ' .
-                        xml_error_string(xml_get_error_code($this->_expat)));
-                return false;
-            }
-            return true;
-        }
-
-        /**
-         *    Sets up expat as the XML parser.
-         *    @return resource        Expat handle.
-         *    @access protected
-         */
-        function &_createParser() {
-            $expat = xml_parser_create();
-            xml_set_object($expat, $this);
-            xml_set_element_handler($expat, '_startElement', '_endElement');
-            xml_set_character_data_handler($expat, '_addContent');
-            xml_set_default_handler($expat, '_default');
-            return $expat;
-        }
-
-        /**
-         *    Opens a new test nesting level.
-         *    @return NestedXmlTag     The group, case or method tag
-         *                             to start.
-         *    @access private
-         */
-        function _pushNestingTag($nested) {
-            array_unshift($this->_tag_stack, $nested);
-        }
-
-        /**
-         *    Accessor for current test structure tag.
-         *    @return NestedXmlTag     The group, case or method tag
-         *                             being parsed.
-         *    @access private
-         */
-        function &_getCurrentNestingTag() {
-            return $this->_tag_stack[0];
-        }
-
-        /**
-         *    Ends a nesting tag.
-         *    @return NestedXmlTag     The group, case or method tag
-         *                             just finished.
-         *    @access private
-         */
-        function _popNestingTag() {
-            return array_shift($this->_tag_stack);
-        }
-
-        /**
-         *    Test if tag is a leaf node with only text content.
-         *    @param string $tag        XML tag name.
-         *    @return @boolean          True if leaf, false if nesting.
-         *    @private
-         */
-        function _isLeaf($tag) {
-            return in_array($tag, array(
-                    'NAME', 'PASS', 'FAIL', 'EXCEPTION', 'MESSAGE', 'FORMATTED', 'SIGNAL'));
-        }
-
-        /**
-         *    Handler for start of event element.
-         *    @param resource $expat     Parser handle.
-         *    @param string $tag         Element name.
-         *    @param hash $attributes    Name value pairs.
-         *                               Attributes without content
-         *                               are marked as true.
-         *    @access protected
-         */
-        function _startElement($expat, $tag, $attributes) {
-            $this->_attributes = $attributes;
-            if ($tag == 'GROUP') {
-                $this->_pushNestingTag(new NestingGroupTag($attributes));
-            } elseif ($tag == 'CASE') {
-                $this->_pushNestingTag(new NestingCaseTag($attributes));
-            } elseif ($tag == 'TEST') {
-                $this->_pushNestingTag(new NestingMethodTag($attributes));
-            } elseif ($this->_isLeaf($tag)) {
-                $this->_in_content_tag = true;
-                $this->_content = '';
-            }
-        }
-
-        /**
-         *    End of element event.
-         *    @param resource $expat     Parser handle.
-         *    @param string $tag         Element name.
-         *    @access protected
-         */
-        function _endElement($expat, $tag) {
-            $this->_in_content_tag = false;
-            if (in_array($tag, array('GROUP', 'CASE', 'TEST'))) {
-                $nesting_tag = $this->_popNestingTag();
-                $nesting_tag->paintEnd($this->_listener);
-            } elseif ($tag == 'NAME') {
-                $nesting_tag = $this->_getCurrentNestingTag();
-                $nesting_tag->setName($this->_content);
-                $nesting_tag->paintStart($this->_listener);
-            } elseif ($tag == 'PASS') {
-                $this->_listener->paintPass($this->_content);
-            } elseif ($tag == 'FAIL') {
-                $this->_listener->paintFail($this->_content);
-            } elseif ($tag == 'EXCEPTION') {
-                $this->_listener->paintError($this->_content);
-            } elseif ($tag == 'SIGNAL') {
-                $this->_listener->paintSignal(
-                        $this->_attributes['TYPE'],
-                        unserialize($this->_content));
-            } elseif ($tag == 'MESSAGE') {
-                $this->_listener->paintMessage($this->_content);
-            } elseif ($tag == 'FORMATTED') {
-                $this->_listener->paintFormattedMessage($this->_content);
-            }
-        }
-
-        /**
-         *    Content between start and end elements.
-         *    @param resource $expat     Parser handle.
-         *    @param string $text        Usually output messages.
-         *    @access protected
-         */
-        function _addContent($expat, $text) {
-            if ($this->_in_content_tag) {
-                $this->_content .= $text;
-            }
-            return true;
-        }
-
-        /**
-         *    XML and Doctype handler. Discards all such content.
-         *    @param resource $expat     Parser handle.
-         *    @param string $default     Text of default content.
-         *    @access protected
-         */
-        function _default($expat, $default) {
-        }
-    }
+	 */
+	class SimpleTestXmlParser {
+		protected $_listener;
+		protected $_expat;
+		protected $_tag_stack;
+		protected $_in_content_tag;
+		protected $_content;
+		protected $_attributes;
+
+		/**
+		 *    Loads a listener with the SimpleReporter
+		 *    interface.
+		 *    @param SimpleReporter $listener   Listener of tag events.
+		 *    @access public
+		 */
+		function SimpleTestXmlParser($listener) {
+			$this->_listener = $listener;
+			$this->_expat = $this->_createParser();
+			$this->_tag_stack = array();
+			$this->_in_content_tag = false;
+			$this->_content = '';
+			$this->_attributes = array();
+		}
+
+		/**
+		 *    Parses a block of XML sending the results to
+		 *    the listener.
+		 *    @param string $chunk        Block of text to read.
+		 *    @return boolean             True if valid XML.
+		 *    @access public
+		 */
+		function parse($chunk) {
+			if (! xml_parse($this->_expat, $chunk)) {
+				trigger_error('XML parse error with ' .
+						xml_error_string(xml_get_error_code($this->_expat)));
+				return false;
+			}
+			return true;
+		}
+
+		/**
+		 *    Sets up expat as the XML parser.
+		 *    @return resource        Expat handle.
+		 *    @access protected
+		 */
+		function &_createParser() {
+			$expat = xml_parser_create();
+			xml_set_object($expat, $this);
+			xml_set_element_handler($expat, '_startElement', '_endElement');
+			xml_set_character_data_handler($expat, '_addContent');
+			xml_set_default_handler($expat, '_default');
+			return $expat;
+		}
+
+		/**
+		 *    Opens a new test nesting level.
+		 *    @return NestedXmlTag     The group, case or method tag
+		 *                             to start.
+		 *    @access private
+		 */
+		function _pushNestingTag($nested) {
+			array_unshift($this->_tag_stack, $nested);
+		}
+
+		/**
+		 *    Accessor for current test structure tag.
+		 *    @return NestedXmlTag     The group, case or method tag
+		 *                             being parsed.
+		 *    @access private
+		 */
+		function &_getCurrentNestingTag() {
+			return $this->_tag_stack[0];
+		}
+
+		/**
+		 *    Ends a nesting tag.
+		 *    @return NestedXmlTag     The group, case or method tag
+		 *                             just finished.
+		 *    @access private
+		 */
+		function _popNestingTag() {
+			return array_shift($this->_tag_stack);
+		}
+
+		/**
+		 *    Test if tag is a leaf node with only text content.
+		 *    @param string $tag        XML tag name.
+		 *    @return @boolean          True if leaf, false if nesting.
+		 *    @private
+		 */
+		function _isLeaf($tag) {
+			return in_array($tag, array(
+					'NAME', 'PASS', 'FAIL', 'EXCEPTION', 'MESSAGE', 'FORMATTED', 'SIGNAL'));
+		}
+
+		/**
+		 *    Handler for start of event element.
+		 *    @param resource $expat     Parser handle.
+		 *    @param string $tag         Element name.
+		 *    @param hash $attributes    Name value pairs.
+		 *                               Attributes without content
+		 *                               are marked as true.
+		 *    @access protected
+		 */
+		function _startElement($expat, $tag, $attributes) {
+			$this->_attributes = $attributes;
+			if ($tag == 'GROUP') {
+				$this->_pushNestingTag(new NestingGroupTag($attributes));
+			} elseif ($tag == 'CASE') {
+				$this->_pushNestingTag(new NestingCaseTag($attributes));
+			} elseif ($tag == 'TEST') {
+				$this->_pushNestingTag(new NestingMethodTag($attributes));
+			} elseif ($this->_isLeaf($tag)) {
+				$this->_in_content_tag = true;
+				$this->_content = '';
+			}
+		}
+
+		/**
+		 *    End of element event.
+		 *    @param resource $expat     Parser handle.
+		 *    @param string $tag         Element name.
+		 *    @access protected
+		 */
+		function _endElement($expat, $tag) {
+			$this->_in_content_tag = false;
+			if (in_array($tag, array('GROUP', 'CASE', 'TEST'))) {
+				$nesting_tag = $this->_popNestingTag();
+				$nesting_tag->paintEnd($this->_listener);
+			} elseif ($tag == 'NAME') {
+				$nesting_tag = $this->_getCurrentNestingTag();
+				$nesting_tag->setName($this->_content);
+				$nesting_tag->paintStart($this->_listener);
+			} elseif ($tag == 'PASS') {
+				$this->_listener->paintPass($this->_content);
+			} elseif ($tag == 'FAIL') {
+				$this->_listener->paintFail($this->_content);
+			} elseif ($tag == 'EXCEPTION') {
+				$this->_listener->paintError($this->_content);
+			} elseif ($tag == 'SIGNAL') {
+				$this->_listener->paintSignal(
+						$this->_attributes['TYPE'],
+						unserialize($this->_content));
+			} elseif ($tag == 'MESSAGE') {
+				$this->_listener->paintMessage($this->_content);
+			} elseif ($tag == 'FORMATTED') {
+				$this->_listener->paintFormattedMessage($this->_content);
+			}
+		}
+
+		/**
+		 *    Content between start and end elements.
+		 *    @param resource $expat     Parser handle.
+		 *    @param string $text        Usually output messages.
+		 *    @access protected
+		 */
+		function _addContent($expat, $text) {
+			if ($this->_in_content_tag) {
+				$this->_content .= $text;
+			}
+			return true;
+		}
+
+		/**
+		 *    XML and Doctype handler. Discards all such content.
+		 *    @param resource $expat     Parser handle.
+		 *    @param string $default     Text of default content.
+		 *    @access protected
+		 */
+		function _default($expat, $default) {
+		}
+	}

tests/test_tools/simpletest/remote.php

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

tests/test_tools/simpletest/options.php

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();
+		}
+	}

tests/test_tools/simpletest/reflection_php4.php

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/parser.php

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

tests/test_tools/simpletest/invoker.php

Indentation +117 added lines, -117 removed lines

@@ -1,138 +1,138 @@
 <?php
-    /**
-     *	Base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	UnitTester
-     *	@version	$Id: invoker.php 1398 2006-09-08 19:31:03Z xue $
-     */
+	/**
+	 *	Base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	UnitTester
+	 *	@version	$Id: invoker.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__) . '/compatibility.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__) . '/compatibility.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;
+		}
 
-        /**
-         *    Runs test level set up. Used for changing
-         *    the mechanics of base test cases.
-         *    @param string $method    Test method to call.
-         *    @access public
-         */
-        function before($method) {
-            $this->_test_case->before($method);
-        }
+		/**
+		 *    Runs test level set up. Used for changing
+		 *    the mechanics of base test cases.
+		 *    @param string $method    Test method to call.
+		 *    @access public
+		 */
+		function before($method) {
+			$this->_test_case->before($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->_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();
+		}
 
-        /**
-         *    Runs test level clean up. Used for changing
-         *    the mechanics of base test cases.
-         *    @param string $method    Test method to call.
-         *    @access public
-         */
-        function after($method) {
-            $this->_test_case->after($method);
-        }
-    }
+		/**
+		 *    Runs test level clean up. Used for changing
+		 *    the mechanics of base test cases.
+		 *    @param string $method    Test method to call.
+		 *    @access public
+		 */
+		function after($method) {
+			$this->_test_case->after($method);
+		}
+	}
 
-    /**
-     *    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();
+		}
 
-        /**
-         *    Runs test level set up. Used for changing
-         *    the mechanics of base test cases.
-         *    @param string $method    Test method to call.
-         *    @access public
-         */
-        function before($method) {
-            $this->_invoker->before($method);
-        }
+		/**
+		 *    Runs test level set up. Used for changing
+		 *    the mechanics of base test cases.
+		 *    @param string $method    Test method to call.
+		 *    @access public
+		 */
+		function before($method) {
+			$this->_invoker->before($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);
-        }
+		/**
+		 *    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);
+		}
 
-        /**
-         *    Runs test level clean up. Used for changing
-         *    the mechanics of base test cases.
-         *    @param string $method    Test method to call.
-         *    @access public
-         */
-        function after($method) {
-            $this->_invoker->after($method);
-        }
-    }
+		/**
+		 *    Runs test level clean up. Used for changing
+		 *    the mechanics of base test cases.
+		 *    @param string $method    Test method to call.
+		 *    @access public
+		 */
+		function after($method) {
+			$this->_invoker->after($method);
+		}
+	}

tests/test_tools/simpletest/browser.php

Indentation +1049 added lines, -1049 removed lines

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

tests/test_tools/simpletest/selector.php

Indentation +108 added lines, -108 removed lines

@@ -1,132 +1,132 @@
 <?php
-    /**
-     *	Base include file for SimpleTest.
-     *	@package	SimpleTest
-     *	@subpackage	WebTester
-     *	@version	$Id: selector.php 1398 2006-09-08 19:31:03Z xue $
-     */
+	/**
+	 *	Base include file for SimpleTest.
+	 *	@package	SimpleTest
+	 *	@subpackage	WebTester
+	 *	@version	$Id: selector.php 1398 2006-09-08 19:31:03Z xue $
+	 */
 
-    /**#@+
+	/**#@+
      * include SimpleTest files
      */
-    require_once(dirname(__FILE__) . '/tag.php');
-    require_once(dirname(__FILE__) . '/encoding.php');
-    /**#@-*/
+	require_once(dirname(__FILE__) . '/tag.php');
+	require_once(dirname(__FILE__) . '/encoding.php');
+	/**#@-*/
 
-    /**
-     *    Used to extract form elements for testing against.
-     *    Searches by name attribute.
+	/**
+	 *    Used to extract form elements for testing against.
+	 *    Searches by name attribute.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleByName {
-        protected $_name;
+	 */
+	class SimpleByName {
+		protected $_name;
 
-        /**
-         *    Stashes the name for later comparison.
-         *    @param string $name     Name attribute to match.
-         */
-        function SimpleByName($name) {
-            $this->_name = $name;
-        }
+		/**
+		 *    Stashes the name for later comparison.
+		 *    @param string $name     Name attribute to match.
+		 */
+		function SimpleByName($name) {
+			$this->_name = $name;
+		}
 
-        /**
-         *    Compares with name attribute of widget.
-         *    @param SimpleWidget $widget    Control to compare.
-         *    @access public
-         */
-        function isMatch($widget) {
-            return ($widget->getName() == $this->_name);
-        }
-    }
+		/**
+		 *    Compares with name attribute of widget.
+		 *    @param SimpleWidget $widget    Control to compare.
+		 *    @access public
+		 */
+		function isMatch($widget) {
+			return ($widget->getName() == $this->_name);
+		}
+	}
 
-    /**
-     *    Used to extract form elements for testing against.
-     *    Searches by visible label or alt text.
+	/**
+	 *    Used to extract form elements for testing against.
+	 *    Searches by visible label or alt text.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleByLabel {
-        protected $_label;
+	 */
+	class SimpleByLabel {
+		protected $_label;
 
-        /**
-         *    Stashes the name for later comparison.
-         *    @param string $label     Visible text to match.
-         */
-        function SimpleByLabel($label) {
-            $this->_label = $label;
-        }
+		/**
+		 *    Stashes the name for later comparison.
+		 *    @param string $label     Visible text to match.
+		 */
+		function SimpleByLabel($label) {
+			$this->_label = $label;
+		}
 
-        /**
-         *    Comparison. Compares visible text of widget or
-         *    related label.
-         *    @param SimpleWidget $widget    Control to compare.
-         *    @access public
-         */
-        function isMatch($widget) {
-            if (! method_exists($widget, 'isLabel')) {
-                return false;
-            }
-            return $widget->isLabel($this->_label);
-        }
-    }
+		/**
+		 *    Comparison. Compares visible text of widget or
+		 *    related label.
+		 *    @param SimpleWidget $widget    Control to compare.
+		 *    @access public
+		 */
+		function isMatch($widget) {
+			if (! method_exists($widget, 'isLabel')) {
+				return false;
+			}
+			return $widget->isLabel($this->_label);
+		}
+	}
 
-    /**
-     *    Used to extract form elements for testing against.
-     *    Searches dy id attribute.
+	/**
+	 *    Used to extract form elements for testing against.
+	 *    Searches dy id attribute.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleById {
-        protected $_id;
+	 */
+	class SimpleById {
+		protected $_id;
 
-        /**
-         *    Stashes the name for later comparison.
-         *    @param string $id     ID atribute to match.
-         */
-        function SimpleById($id) {
-            $this->_id = $id;
-        }
+		/**
+		 *    Stashes the name for later comparison.
+		 *    @param string $id     ID atribute to match.
+		 */
+		function SimpleById($id) {
+			$this->_id = $id;
+		}
 
-        /**
-         *    Comparison. Compares id attribute of widget.
-         *    @param SimpleWidget $widget    Control to compare.
-         *    @access public
-         */
-        function isMatch($widget) {
-            return $widget->isId($this->_id);
-        }
-    }
+		/**
+		 *    Comparison. Compares id attribute of widget.
+		 *    @param SimpleWidget $widget    Control to compare.
+		 *    @access public
+		 */
+		function isMatch($widget) {
+			return $widget->isId($this->_id);
+		}
+	}
 
-    /**
-     *    Used to extract form elements for testing against.
-     *    Searches by visible label, name or alt text.
+	/**
+	 *    Used to extract form elements for testing against.
+	 *    Searches by visible label, name or alt text.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleByLabelOrName {
-        protected $_label;
+	 */
+	class SimpleByLabelOrName {
+		protected $_label;
 
-        /**
-         *    Stashes the name/label for later comparison.
-         *    @param string $label     Visible text to match.
-         */
-        function SimpleByLabelOrName($label) {
-            $this->_label = $label;
-        }
+		/**
+		 *    Stashes the name/label for later comparison.
+		 *    @param string $label     Visible text to match.
+		 */
+		function SimpleByLabelOrName($label) {
+			$this->_label = $label;
+		}
 
-        /**
-         *    Comparison. Compares visible text of widget or
-         *    related label or name.
-         *    @param SimpleWidget $widget    Control to compare.
-         *    @access public
-         */
-        function isMatch($widget) {
-            if (method_exists($widget, 'isLabel')) {
-                if ($widget->isLabel($this->_label)) {
-                    return true;
-                }
-            }
-            return ($widget->getName() == $this->_label);
-        }
-    }
\ No newline at end of file
+		/**
+		 *    Comparison. Compares visible text of widget or
+		 *    related label or name.
+		 *    @param SimpleWidget $widget    Control to compare.
+		 *    @access public
+		 */
+		function isMatch($widget) {
+			if (method_exists($widget, 'isLabel')) {
+				if ($widget->isLabel($this->_label)) {
+					return true;
+				}
+			}
+			return ($widget->getName() == $this->_label);
+		}
+	}
\ No newline at end of file

tests/unit/TComponentTest.php

Indentation +959 added lines, -959 removed lines

@@ -12,15 +12,15 @@ 
   private $_colorattribute = null;
 
   public function getAutoGlobalListen() {
-    return true;
+	return true;
   }
 
   public function getText() {
-    return $this->_text;
+	return $this->_text;
   }
 
   public function setText($value) {
-    $this->_text=$value;
+	$this->_text=$value;
   }
 
   public function getReadOnlyProperty() {
@@ -32,37 +32,37 @@ 
   }
 
   public function getObject() {
-    if(!$this->_object) {
-      $this->_object=new NewComponent;
-      $this->_object->_text='object text';
-    }
-    return $this->_object;
+	if(!$this->_object) {
+	  $this->_object=new NewComponent;
+	  $this->_object->_text='object text';
+	}
+	return $this->_object;
   }
 
   public function onMyEvent($param) {
-    $this->raiseEvent('OnMyEvent',$this,$param);
+	$this->raiseEvent('OnMyEvent',$this,$param);
   }
 
   public function myEventHandler($sender,$param) {
-    $this->_eventHandled=true;
+	$this->_eventHandled=true;
   }
 
   public function eventReturnValue($sender,$param) {
-    return $param->Return;
+	return $param->Return;
   }
 
   public function isEventHandled() {
-    return $this->_eventHandled;
+	return $this->_eventHandled;
   }
 
   public function resetEventHandled() {
-    $this->_eventHandled = false;
+	$this->_eventHandled = false;
   }
   public function getReturn() {
   	return $this->_return;
   }
   public function setReturn($return) {
-    $this->_return = $return;
+	$this->_return = $return;
   }
   public function getjsColorAttribute() {
 	return $this->_colorattribute;
@@ -202,7 +202,7 @@ 
 	}
 
 	public function onBehaviorEvent($sender, $param,$responsetype=null,$postfunction=null) {
-    	return $this->getOwner()->raiseEvent('onBehaviorEvent',$sender,$param,$responsetype,$postfunction);
+		return $this->getOwner()->raiseEvent('onBehaviorEvent',$sender,$param,$responsetype,$postfunction);
 	}
 	public function fxGlobalBehaviorEvent($sender, $param) {
 	}
@@ -413,7 +413,7 @@ 
   protected $component;
 
   public function setUp() {
-    $this->component = new NewComponent();
+	$this->component = new NewComponent();
   }
 
 
@@ -421,14 +421,14 @@ 
   	// PHP version 5.3.6 doesn't call the __destruct method when unsetting variables;
   	//	Thus any object that listens must be explicitly call unlisten in this version of PHP.
   	if($this->component)
-	    $this->component->unlisten();
-    $this->component = null;
+		$this->component->unlisten();
+	$this->component = null;
   }
 
 
   public function testGetListeningToGlobalEvents() {
   	$this->assertEquals(true, $this->component->getListeningToGlobalEvents());
-    $this->component->unlisten();
+	$this->component->unlisten();
   	$this->assertEquals(false, $this->component->getListeningToGlobalEvents());
   }
 
@@ -437,12 +437,12 @@ 
   	// the default object auto installs class behavior hooks
   	$this->assertEquals(1, $this->component->getEventHandlers('fxAttachClassBehavior')->getCount());
   	$this->assertEquals(1, $this->component->getEventHandlers('fxDetachClassBehavior')->getCount());
-    $this->assertTrue($this->component->getListeningToGlobalEvents());
+	$this->assertTrue($this->component->getListeningToGlobalEvents());
 
-    // this object does not auto install class behavior hooks, thus not changing the global event structure.
-    //	Creating a new instance should _not_ influence the fxAttachClassBehavior and fxDetachClassBehavior
-    //	count.
-    $component_nolisten = new NewComponentNoListen();
+	// this object does not auto install class behavior hooks, thus not changing the global event structure.
+	//	Creating a new instance should _not_ influence the fxAttachClassBehavior and fxDetachClassBehavior
+	//	count.
+	$component_nolisten = new NewComponentNoListen();
   	$this->assertEquals(1, $this->component->getEventHandlers('fxAttachClassBehavior')->getCount());
   	$this->assertEquals(1, $this->component->getEventHandlers('fxDetachClassBehavior')->getCount());
   	$this->assertEquals(1, $component_nolisten->getEventHandlers('fxAttachClassBehavior')->getCount());
@@ -523,66 +523,66 @@ 
   //Test Class behaviors
   public function testAttachClassBehavior() {
 
-    // ensure that the class is listening
+	// ensure that the class is listening
   	$this->assertEquals(1, $this->component->getEventHandlers('fxAttachClassBehavior')->getCount());
 
   	//Test that the component is not a FooClassBehavior
-    $this->assertNull($this->component->asa('FooClassBehavior'), "Component is already a FooClassBehavior and should not have this behavior");
+	$this->assertNull($this->component->asa('FooClassBehavior'), "Component is already a FooClassBehavior and should not have this behavior");
 
-    //Add the FooClassBehavior
-    $this->component->attachClassBehavior('FooClassBehavior', new FooClassBehavior);
+	//Add the FooClassBehavior
+	$this->component->attachClassBehavior('FooClassBehavior', new FooClassBehavior);
 
-    //Test that the existing listening component can be a FooClassBehavior
-    $this->assertNotNull($this->component->asa('FooClassBehavior'), "Component is does not have the FooClassBehavior and should have this behavior");
+	//Test that the existing listening component can be a FooClassBehavior
+	$this->assertNotNull($this->component->asa('FooClassBehavior'), "Component is does not have the FooClassBehavior and should have this behavior");
 
-    // test if the function modifies new instances of the object
-    $anothercomponent = new NewComponent();
+	// test if the function modifies new instances of the object
+	$anothercomponent = new NewComponent();
 
-    //The new component should be a FooClassBehavior
-    $this->assertNotNull($anothercomponent->asa('FooClassBehavior'), "anothercomponent does not have the FooClassBehavior");
+	//The new component should be a FooClassBehavior
+	$this->assertNotNull($anothercomponent->asa('FooClassBehavior'), "anothercomponent does not have the FooClassBehavior");
 
-    // test when overwriting an existing class behavior, it should throw an TInvalidOperationException
-    try {
-      $this->component->attachClassBehavior('FooClassBehavior', new BarClassBehavior);
-      $this->fail('TInvalidOperationException not raised when overwriting an existing behavior');
-    } catch(TInvalidOperationException $e) {
-    }
+	// test when overwriting an existing class behavior, it should throw an TInvalidOperationException
+	try {
+	  $this->component->attachClassBehavior('FooClassBehavior', new BarClassBehavior);
+	  $this->fail('TInvalidOperationException not raised when overwriting an existing behavior');
+	} catch(TInvalidOperationException $e) {
+	}
 
 
-    // test when overwriting an existing class behavior, it should throw an TInvalidOperationException
-    try {
+	// test when overwriting an existing class behavior, it should throw an TInvalidOperationException
+	try {
   	  $this->component->attachClassBehavior('FooBarBehavior', 'FooBarBehavior', 'TComponent');
-      $this->fail('TInvalidOperationException not raised when trying to place a behavior on the root object TComponent');
-    } catch(TInvalidOperationException $e) {
-    }
+	  $this->fail('TInvalidOperationException not raised when trying to place a behavior on the root object TComponent');
+	} catch(TInvalidOperationException $e) {
+	}
 
 
-    // test if the function does not modify any existing objects that are not listening
-    //	The FooClassBehavior is already a part of the class behaviors thus the new instance gets the behavior.
-    $nolistencomponent = new NewComponentNoListen();
+	// test if the function does not modify any existing objects that are not listening
+	//	The FooClassBehavior is already a part of the class behaviors thus the new instance gets the behavior.
+	$nolistencomponent = new NewComponentNoListen();
 
-    // test if the function modifies all existing objects that are listening
-    //	Adding a behavior to the first object, the second instance should automatically get the class behavior.
-    //		This is because the second object is listening to the global events of class behaviors
-    $this->component->attachClassBehavior('BarClassBehavior', new BarClassBehavior);
-    $this->assertNotNull($anothercomponent->asa('BarClassBehavior'), "anothercomponent is does not have the BarClassBehavior");
+	// test if the function modifies all existing objects that are listening
+	//	Adding a behavior to the first object, the second instance should automatically get the class behavior.
+	//		This is because the second object is listening to the global events of class behaviors
+	$this->component->attachClassBehavior('BarClassBehavior', new BarClassBehavior);
+	$this->assertNotNull($anothercomponent->asa('BarClassBehavior'), "anothercomponent is does not have the BarClassBehavior");
 
-    // The no listen object should not have the BarClassBehavior because it was added as a class behavior after the object was instanced
-    $this->assertNull($nolistencomponent->asa('BarClassBehavior'), "nolistencomponent has the BarClassBehavior and should not");
+	// The no listen object should not have the BarClassBehavior because it was added as a class behavior after the object was instanced
+	$this->assertNull($nolistencomponent->asa('BarClassBehavior'), "nolistencomponent has the BarClassBehavior and should not");
 
-    //	But the no listen object should have the FooClassBehavior because the class behavior was installed before the object was instanced
-    $this->assertNotNull($nolistencomponent->asa('FooClassBehavior'), "nolistencomponent is does not have the FooClassBehavior");
+	//	But the no listen object should have the FooClassBehavior because the class behavior was installed before the object was instanced
+	$this->assertNotNull($nolistencomponent->asa('FooClassBehavior'), "nolistencomponent is does not have the FooClassBehavior");
 
-    //Clear out what was done during this test
-    $anothercomponent->unlisten();
-    $this->component->detachClassBehavior('FooClassBehavior');
-    $this->component->detachClassBehavior('BarClassBehavior');
+	//Clear out what was done during this test
+	$anothercomponent->unlisten();
+	$this->component->detachClassBehavior('FooClassBehavior');
+	$this->component->detachClassBehavior('BarClassBehavior');
 
-    // Test attaching of single object behaviors as class-wide behaviors
-    $this->component->attachClassBehavior('BarBehaviorObject', 'BarBehavior');
-    $this->assertTrue($this->component->asa('BarBehaviorObject') instanceof BarBehavior);
-    $this->assertEquals($this->component->BarBehaviorObject->Owner, $this->component);
-    $this->component->detachClassBehavior('BarBehaviorObject');
+	// Test attaching of single object behaviors as class-wide behaviors
+	$this->component->attachClassBehavior('BarBehaviorObject', 'BarBehavior');
+	$this->assertTrue($this->component->asa('BarBehaviorObject') instanceof BarBehavior);
+	$this->assertEquals($this->component->BarBehaviorObject->Owner, $this->component);
+	$this->component->detachClassBehavior('BarBehaviorObject');
   }
 
 
@@ -590,48 +590,48 @@ 
 
 
   public function testDetachClassBehavior() {
-    // ensure that the component is listening
+	// ensure that the component is listening
   	$this->assertEquals(1, $this->component->getEventHandlers('fxDetachClassBehavior')->getCount());
 
-    $prenolistencomponent = new NewComponentNoListen();
+	$prenolistencomponent = new NewComponentNoListen();
 
   	//Attach a class behavior
-    $this->component->attachClassBehavior('FooClassBehavior', new FooClassBehavior);
+	$this->component->attachClassBehavior('FooClassBehavior', new FooClassBehavior);
 
-    //Create new components that listen and don't listen to global events
-    $anothercomponent = new NewComponent();
-    $postnolistencomponent = new NewComponentNoListen();
+	//Create new components that listen and don't listen to global events
+	$anothercomponent = new NewComponent();
+	$postnolistencomponent = new NewComponentNoListen();
 
-    //ensures that all the Components are properly initialized
+	//ensures that all the Components are properly initialized
   	$this->assertEquals(2, $this->component->getEventHandlers('fxDetachClassBehavior')->getCount());
-    $this->assertNotNull($this->component->asa('FooClassBehavior'), "Component does not have the FooClassBehavior and should have this behavior");
-    $this->assertNull($prenolistencomponent->asa('FooClassBehavior'), "Component has the FooClassBehavior and should _not_ have this behavior");
-    $this->assertNotNull($anothercomponent->asa('FooClassBehavior'), "Component does not have the FooClassBehavior and should have this behavior");
-    $this->assertNotNull($postnolistencomponent->asa('FooClassBehavior'), "Component does not have the FooClassBehavior and should have this behavior");
+	$this->assertNotNull($this->component->asa('FooClassBehavior'), "Component does not have the FooClassBehavior and should have this behavior");
+	$this->assertNull($prenolistencomponent->asa('FooClassBehavior'), "Component has the FooClassBehavior and should _not_ have this behavior");
+	$this->assertNotNull($anothercomponent->asa('FooClassBehavior'), "Component does not have the FooClassBehavior and should have this behavior");
+	$this->assertNotNull($postnolistencomponent->asa('FooClassBehavior'), "Component does not have the FooClassBehavior and should have this behavior");
 
 
-    $this->component->detachClassBehavior('FooClassBehavior');
+	$this->component->detachClassBehavior('FooClassBehavior');
 
-    $this->assertNull($this->component->asa('FooClassBehavior'), "Component has the FooClassBehavior and should _not_ have this behavior");
-    $this->assertNull($prenolistencomponent->asa('FooClassBehavior'), "Component has the FooClassBehavior and should _not_ have this behavior");
-    $this->assertNull($anothercomponent->asa('FooClassBehavior'), "Component has the FooClassBehavior and should _not_ have this behavior");
-    $this->assertNotNull($postnolistencomponent->asa('FooClassBehavior'), "Component does not have the FooClassBehavior and should have this behavior");
+	$this->assertNull($this->component->asa('FooClassBehavior'), "Component has the FooClassBehavior and should _not_ have this behavior");
+	$this->assertNull($prenolistencomponent->asa('FooClassBehavior'), "Component has the FooClassBehavior and should _not_ have this behavior");
+	$this->assertNull($anothercomponent->asa('FooClassBehavior'), "Component has the FooClassBehavior and should _not_ have this behavior");
+	$this->assertNotNull($postnolistencomponent->asa('FooClassBehavior'), "Component does not have the FooClassBehavior and should have this behavior");
 
 
-    //tear down function variables
-    $anothercomponent->unlisten();
+	//tear down function variables
+	$anothercomponent->unlisten();
   }
 
   public function testGetClassHierarchy() {
-    $component = new DynamicCatchingComponent;
-    $this->assertEquals(array('TComponent', 'NewComponent', 'NewComponentNoListen', 'DynamicCatchingComponent'), $component->getClassHierarchy());
-    $this->assertEquals(array('TComponent', 'NewComponent', 'NewComponentNoListen', 'DynamicCatchingComponent'), $component->getClassHierarchy(false));
-    $this->assertEquals(array('tcomponent', 'newcomponent', 'newcomponentnolisten', 'dynamiccatchingcomponent'), $component->getClassHierarchy(true));
+	$component = new DynamicCatchingComponent;
+	$this->assertEquals(array('TComponent', 'NewComponent', 'NewComponentNoListen', 'DynamicCatchingComponent'), $component->getClassHierarchy());
+	$this->assertEquals(array('TComponent', 'NewComponent', 'NewComponentNoListen', 'DynamicCatchingComponent'), $component->getClassHierarchy(false));
+	$this->assertEquals(array('tcomponent', 'newcomponent', 'newcomponentnolisten', 'dynamiccatchingcomponent'), $component->getClassHierarchy(true));
   }
 
 
   public function testAsA() {
-    $anothercomponent = new NewComponent();
+	$anothercomponent = new NewComponent();
 
   	// ensure the component does not have the FooClassBehavior
   	$this->assertNull($this->component->asa('FooClassBehavior'));
@@ -645,24 +645,24 @@ 
   	$this->assertNull($anothercomponent->asa('NonExistantClassBehavior'));
 
   	// add the class behavior
-    $this->component->attachClassBehavior('FooClassBehavior', new FooClassBehavior);
+	$this->component->attachClassBehavior('FooClassBehavior', new FooClassBehavior);
 
-    //Check that the component has only the class behavior assigned
+	//Check that the component has only the class behavior assigned
   	$this->assertNotNull($this->component->asa('FooClassBehavior'));
   	$this->assertNull($this->component->asa('FooFooClassBehavior'));
   	$this->assertNull($this->component->asa('BarClassBehavior'));
   	$this->assertNull($this->component->asa('NonExistantClassBehavior'));
 
-    //Check that the component has only the class behavior assigned
+	//Check that the component has only the class behavior assigned
   	$this->assertNotNull($anothercomponent->asa('FooClassBehavior'));
   	$this->assertNull($anothercomponent->asa('FooFooClassBehavior'));
   	$this->assertNull($anothercomponent->asa('BarClassBehavior'));
   	$this->assertNull($anothercomponent->asa('NonExistantClassBehavior'));
 
   	// remove the class behavior
-    $this->component->detachClassBehavior('FooClassBehavior');
+	$this->component->detachClassBehavior('FooClassBehavior');
 
-    // Check the function doesn't have the behavior any more
+	// Check the function doesn't have the behavior any more
   	$this->assertNull($this->component->asa('FooClassBehavior'));
   	$this->assertNull($this->component->asa('FooFooClassBehavior'));
   	$this->assertNull($this->component->asa('BarClassBehavior'));
@@ -678,13 +678,13 @@ 
 
   	$this->component->attachBehavior('BarBehavior', new BarBehavior);
 
-    //Check that the component has only the object behavior assigned
+	//Check that the component has only the object behavior assigned
   	$this->assertNull($this->component->asa('FooBehavior'));
   	$this->assertNull($this->component->asa('FooFooBehavior'));
   	$this->assertNotNull($this->component->asa('BarBehavior'));
   	$this->assertNull($this->component->asa('NonExistantBehavior'));
 
-    //Check that the component has the behavior assigned
+	//Check that the component has the behavior assigned
   	$this->assertNull($anothercomponent->asa('FooBehavior'));
   	$this->assertNull($anothercomponent->asa('FooFooBehavior'));
   	$this->assertNull($anothercomponent->asa('BarBehavior'));
@@ -692,690 +692,690 @@ 
 
   	$this->component->detachBehavior('BarBehavior');
 
-    //Check that the component has no object behaviors assigned
+	//Check that the component has no object behaviors assigned
   	$this->assertNull($this->component->asa('FooBehavior'));
   	$this->assertNull($this->component->asa('FooFooBehavior'));
   	$this->assertNull($this->component->asa('BarBehavior'));
   	$this->assertNull($this->component->asa('NonExistantBehavior'));
 
-    //Check that the component has no behavior assigned
+	//Check that the component has no behavior assigned
   	$this->assertNull($anothercomponent->asa('FooBehavior'));
   	$this->assertNull($anothercomponent->asa('FooFooBehavior'));
   	$this->assertNull($anothercomponent->asa('BarBehavior'));
   	$this->assertNull($anothercomponent->asa('NonExistantBehavior'));
 
-    $anothercomponent->unlisten();
+	$anothercomponent->unlisten();
   }
 
   public function testIsA() {
   	//This doesn't check the IInstanceCheck functionality, separate function
 
-    $this->assertTrue($this->component->isa('TComponent'));
-    $this->assertTrue($this->component->isa('NewComponent'));
-    $this->assertFalse($this->component->isa(new FooBehavior));
-    $this->assertFalse($this->component->isa('FooBehavior'));
+	$this->assertTrue($this->component->isa('TComponent'));
+	$this->assertTrue($this->component->isa('NewComponent'));
+	$this->assertFalse($this->component->isa(new FooBehavior));
+	$this->assertFalse($this->component->isa('FooBehavior'));
 
-    //Ensure there is no BarBehavior
+	//Ensure there is no BarBehavior
   	$this->assertNull($this->component->asa('FooFooBehavior'));
 
-    $this->assertFalse($this->component->isa('FooBehavior'));
-    $this->assertFalse($this->component->isa('FooFooBehavior'));
+	$this->assertFalse($this->component->isa('FooBehavior'));
+	$this->assertFalse($this->component->isa('FooFooBehavior'));
 
   	$this->component->attachBehavior('FooFooBehavior', new FooFooBehavior);
 
   	$this->assertNotNull($this->component->asa('FooFooBehavior'));
 
-    $this->assertTrue($this->component->isa('FooBehavior'));
-    $this->assertTrue($this->component->isa('FooFooBehavior'));
+	$this->assertTrue($this->component->isa('FooBehavior'));
+	$this->assertTrue($this->component->isa('FooFooBehavior'));
 
 	$this->component->disableBehaviors();
 	// It still has the behavior
   	$this->assertNotNull($this->component->asa('FooFooBehavior'));
 
   	// But it is not expressed
-    $this->assertFalse($this->component->isa('FooBehavior'));
-    $this->assertFalse($this->component->isa('FooFooBehavior'));
+	$this->assertFalse($this->component->isa('FooBehavior'));
+	$this->assertFalse($this->component->isa('FooFooBehavior'));
 
 	$this->component->enableBehaviors();
   	$this->assertNotNull($this->component->asa('FooFooBehavior'));
 
-    $this->assertTrue($this->component->isa('FooFooBehavior'));
+	$this->assertTrue($this->component->isa('FooFooBehavior'));
 
 
 
    	$this->component->attachBehavior('FooBarBehavior', new FooBarBehavior);
 
-    $this->assertTrue($this->component->isa('FooBehavior'));
-    $this->assertTrue($this->component->isa('FooBarBehavior'));
+	$this->assertTrue($this->component->isa('FooBehavior'));
+	$this->assertTrue($this->component->isa('FooBarBehavior'));
 
-    $this->component->disableBehavior('FooBarBehavior');
+	$this->component->disableBehavior('FooBarBehavior');
 
-    $this->assertTrue($this->component->isa('FooBehavior'));
-    $this->assertFalse($this->component->isa('FooBarBehavior'));
+	$this->assertTrue($this->component->isa('FooBehavior'));
+	$this->assertFalse($this->component->isa('FooBarBehavior'));
 
-    $this->component->enableBehavior('FooBarBehavior');
-    $this->component->disableBehavior('FooFooBehavior');
-    $this->assertFalse($this->component->isa('FooBehavior'));
-    $this->assertFalse($this->component->isa('FooFooBehavior'));
-    $this->assertTrue($this->component->isa('FooBarBehavior'));
+	$this->component->enableBehavior('FooBarBehavior');
+	$this->component->disableBehavior('FooFooBehavior');
+	$this->assertFalse($this->component->isa('FooBehavior'));
+	$this->assertFalse($this->component->isa('FooFooBehavior'));
+	$this->assertTrue($this->component->isa('FooBarBehavior'));
 
-    $this->component->disableBehavior('FooBarBehavior');
-    $this->component->disableBehavior('FooFooBehavior');
+	$this->component->disableBehavior('FooBarBehavior');
+	$this->component->disableBehavior('FooFooBehavior');
 
-    $this->assertFalse($this->component->isa('FooBehavior'));
-    $this->assertFalse($this->component->isa('FooFooBehavior'));
-    $this->assertFalse($this->component->isa('FooBarBehavior'));
+	$this->assertFalse($this->component->isa('FooBehavior'));
+	$this->assertFalse($this->component->isa('FooFooBehavior'));
+	$this->assertFalse($this->component->isa('FooBarBehavior'));
 
-    $this->component->enableBehavior('FooBarBehavior');
-    $this->component->enableBehavior('FooFooBehavior');
+	$this->component->enableBehavior('FooBarBehavior');
+	$this->component->enableBehavior('FooFooBehavior');
 
-    $this->assertTrue($this->component->isa('FooFooBehavior'));
-    $this->assertTrue($this->component->isa('FooBarBehavior'));
+	$this->assertTrue($this->component->isa('FooFooBehavior'));
+	$this->assertTrue($this->component->isa('FooBarBehavior'));
 
 
   	$this->component->detachBehavior('FooFooBehavior');
   	$this->component->detachBehavior('FooBarBehavior');
 
-    $this->assertFalse($this->component->isa(new FooBehavior));
-    $this->assertFalse($this->component->isa('FooBehavior'));
-    $this->assertFalse($this->component->isa(new FooFooBehavior));
-    $this->assertFalse($this->component->isa('FooFooBehavior'));
-    $this->assertFalse($this->component->isa(new FooBarBehavior));
-    $this->assertFalse($this->component->isa('FooBarBehavior'));
+	$this->assertFalse($this->component->isa(new FooBehavior));
+	$this->assertFalse($this->component->isa('FooBehavior'));
+	$this->assertFalse($this->component->isa(new FooFooBehavior));
+	$this->assertFalse($this->component->isa('FooFooBehavior'));
+	$this->assertFalse($this->component->isa(new FooBarBehavior));
+	$this->assertFalse($this->component->isa('FooBarBehavior'));
 
   }
 
   public function testIsA_with_IInstanceCheck() {
 
-    $this->assertTrue($this->component->isa('NewComponent'));
-    $this->assertFalse($this->component->isa('PreBarBehavior'));
+	$this->assertTrue($this->component->isa('NewComponent'));
+	$this->assertFalse($this->component->isa('PreBarBehavior'));
 
-    $this->component->attachBehavior('BarBehavior', $behavior = new BarBehavior);
+	$this->component->attachBehavior('BarBehavior', $behavior = new BarBehavior);
 
-    $behavior->setInstanceReturn(null);
+	$behavior->setInstanceReturn(null);
 
-    $this->assertTrue($this->component->isa('NewComponent'));
-    $this->assertTrue($this->component->isa('PreBarBehavior'));
-    $this->assertFalse($this->component->isa('FooBehavior'));
+	$this->assertTrue($this->component->isa('NewComponent'));
+	$this->assertTrue($this->component->isa('PreBarBehavior'));
+	$this->assertFalse($this->component->isa('FooBehavior'));
 
-    // This forces the iso on the BarBehavior to respond to any class with false
-    $behavior->setInstanceReturn(false);
-    $this->assertFalse($this->component->isa('PreBarBehavior'));
-    $this->assertFalse($this->component->isa('FooBehavior'));
+	// This forces the iso on the BarBehavior to respond to any class with false
+	$behavior->setInstanceReturn(false);
+	$this->assertFalse($this->component->isa('PreBarBehavior'));
+	$this->assertFalse($this->component->isa('FooBehavior'));
 
-    //This forces the isa on the BarBehavior to respond to any class with true
-    $behavior->setInstanceReturn(true);
-    $this->assertTrue($this->component->isa('FooBehavior'));
+	//This forces the isa on the BarBehavior to respond to any class with true
+	$behavior->setInstanceReturn(true);
+	$this->assertTrue($this->component->isa('FooBehavior'));
 
 
   }
 
   public function testAttachDetachBehavior() {
 
-    try {
+	try {
 	  $this->component->faaEverMore(true, true);
-      $this->fail('TApplicationException not raised trying to execute a undefined class method');
-    } catch(TApplicationException $e) {}
-
-    $this->assertNull($this->component->asa('FooBehavior'));
-    $this->assertFalse($this->component->isa('FooBehavior'));
-    $this->assertNull($this->component->asa('BarBehavior'));
-    $this->assertFalse($this->component->isa('BarBehavior'));
-
-    try {
-      $this->component->attachBehavior('FooBehavior', new TComponent);
-      $this->fail('TApplicationException not raised trying to execute a undefined class method');
-    } catch(TInvalidDataTypeException $e) {}
-
-    $this->component->attachBehavior('FooBehavior', new FooBehavior);
-
-    $this->assertNotNull($this->component->asa('FooBehavior'));
-    $this->assertTrue($this->component->isa('FooBehavior'));
-    $this->assertNull($this->component->asa('BarBehavior'));
-    $this->assertFalse($this->component->isa('BarBehavior'));
-
-    try {
-	    $this->assertTrue($this->component->faaEverMore(true, true));
-    } catch(TApplicationException $e) {
-      $this->fail('TApplicationException raised while trying to execute a behavior class method');
-    }
+	  $this->fail('TApplicationException not raised trying to execute a undefined class method');
+	} catch(TApplicationException $e) {}
+
+	$this->assertNull($this->component->asa('FooBehavior'));
+	$this->assertFalse($this->component->isa('FooBehavior'));
+	$this->assertNull($this->component->asa('BarBehavior'));
+	$this->assertFalse($this->component->isa('BarBehavior'));
+
+	try {
+	  $this->component->attachBehavior('FooBehavior', new TComponent);
+	  $this->fail('TApplicationException not raised trying to execute a undefined class method');
+	} catch(TInvalidDataTypeException $e) {}
+
+	$this->component->attachBehavior('FooBehavior', new FooBehavior);
+
+	$this->assertNotNull($this->component->asa('FooBehavior'));
+	$this->assertTrue($this->component->isa('FooBehavior'));
+	$this->assertNull($this->component->asa('BarBehavior'));
+	$this->assertFalse($this->component->isa('BarBehavior'));
+
+	try {
+		$this->assertTrue($this->component->faaEverMore(true, true));
+	} catch(TApplicationException $e) {
+	  $this->fail('TApplicationException raised while trying to execute a behavior class method');
+	}
 
-    try {
+	try {
 	  $this->component->noMethodHere(true);
-      $this->fail('TApplicationException not raised trying to execute a undefined class method');
-    } catch(TApplicationException $e) {}
+	  $this->fail('TApplicationException not raised trying to execute a undefined class method');
+	} catch(TApplicationException $e) {}
 
-    $this->assertTrue($this->component->disableBehavior('FooBehavior'));
+	$this->assertTrue($this->component->disableBehavior('FooBehavior'));
 
-    //BarBehavior is not a behavior at this time
-    $this->assertNull($this->component->disableBehavior('BarBehavior'));
+	//BarBehavior is not a behavior at this time
+	$this->assertNull($this->component->disableBehavior('BarBehavior'));
 
-    try {
+	try {
 	  $this->component->faaEverMore(true, true);
-      $this->fail('TApplicationException not raised trying to execute a undefined class method');
-    } catch(TApplicationException $e) {}
+	  $this->fail('TApplicationException not raised trying to execute a undefined class method');
+	} catch(TApplicationException $e) {}
 
-    $this->assertTrue($this->component->enableBehavior('FooBehavior'));
+	$this->assertTrue($this->component->enableBehavior('FooBehavior'));
 
-    //BarBehavior is not a behavior at this time
-    $this->assertNull($this->component->enableBehavior('BarBehavior'));
+	//BarBehavior is not a behavior at this time
+	$this->assertNull($this->component->enableBehavior('BarBehavior'));
 
-    try {
-	    $this->assertTrue($this->component->faaEverMore(true, true));
-    } catch(TApplicationException $e) {
-      $this->fail('TApplicationException raised while trying to execute a behavior class method');
-    }
+	try {
+		$this->assertTrue($this->component->faaEverMore(true, true));
+	} catch(TApplicationException $e) {
+	  $this->fail('TApplicationException raised while trying to execute a behavior class method');
+	}
 
-    $this->component->detachBehavior('FooBehavior');
+	$this->component->detachBehavior('FooBehavior');
 
-    $this->assertNull($this->component->asa('FooBehavior'));
-    $this->assertFalse($this->component->isa('FooBehavior'));
-    $this->assertNull($this->component->asa('BarBehavior'));
-    $this->assertFalse($this->component->isa('BarBehavior'));
+	$this->assertNull($this->component->asa('FooBehavior'));
+	$this->assertFalse($this->component->isa('FooBehavior'));
+	$this->assertNull($this->component->asa('BarBehavior'));
+	$this->assertFalse($this->component->isa('BarBehavior'));
 
   }
 
   public function testAttachDetachBehaviors() {
-    $this->assertNull($this->component->asa('FooBehavior'));
-    $this->assertNull($this->component->asa('BarBehavior'));
-    $this->assertNull($this->component->asa('FooBarBehavior'));
-    $this->assertNull($this->component->asa('PreBarBehavior'));
+	$this->assertNull($this->component->asa('FooBehavior'));
+	$this->assertNull($this->component->asa('BarBehavior'));
+	$this->assertNull($this->component->asa('FooBarBehavior'));
+	$this->assertNull($this->component->asa('PreBarBehavior'));
 
-    $this->component->attachBehaviors(array('FooFooBehavior' => new FooFooBehavior, 'BarBehavior' => new BarBehavior, 'PreBarBehavior' => new PreBarBehavior));
+	$this->component->attachBehaviors(array('FooFooBehavior' => new FooFooBehavior, 'BarBehavior' => new BarBehavior, 'PreBarBehavior' => new PreBarBehavior));
 
-    $this->assertNull($this->component->asa('FooBehavior'));
-    $this->assertNotNull($this->component->asa('FooFooBehavior'));
-    $this->assertNotNull($this->component->asa('BarBehavior'));
-    $this->assertNull($this->component->asa('FooBarBehavior'));
-    $this->assertNotNull($this->component->asa('PreBarBehavior'));
+	$this->assertNull($this->component->asa('FooBehavior'));
+	$this->assertNotNull($this->component->asa('FooFooBehavior'));
+	$this->assertNotNull($this->component->asa('BarBehavior'));
+	$this->assertNull($this->component->asa('FooBarBehavior'));
+	$this->assertNotNull($this->component->asa('PreBarBehavior'));
 
-    $this->assertTrue($this->component->isa('FooFooBehavior'));
-    $this->assertTrue($this->component->isa('FooBehavior'));
-    $this->assertTrue($this->component->isa('BarBehavior'));
-    $this->assertTrue($this->component->isa('PreBarBehavior'));
-    $this->assertFalse($this->component->isa('FooBarBehavior'));
+	$this->assertTrue($this->component->isa('FooFooBehavior'));
+	$this->assertTrue($this->component->isa('FooBehavior'));
+	$this->assertTrue($this->component->isa('BarBehavior'));
+	$this->assertTrue($this->component->isa('PreBarBehavior'));
+	$this->assertFalse($this->component->isa('FooBarBehavior'));
 
-    $this->component->detachBehaviors(array('FooFooBehavior' => new FooFooBehavior, 'BarBehavior' => new BarBehavior));
+	$this->component->detachBehaviors(array('FooFooBehavior' => new FooFooBehavior, 'BarBehavior' => new BarBehavior));
 
-    $this->assertNull($this->component->asa('FooBehavior'));
-    $this->assertNull($this->component->asa('FooFooBehavior'));
-    $this->assertNull($this->component->asa('BarBehavior'));
-    $this->assertNull($this->component->asa('FooBarBehavior'));
-    $this->assertNotNull($this->component->asa('PreBarBehavior'));
+	$this->assertNull($this->component->asa('FooBehavior'));
+	$this->assertNull($this->component->asa('FooFooBehavior'));
+	$this->assertNull($this->component->asa('BarBehavior'));
+	$this->assertNull($this->component->asa('FooBarBehavior'));
+	$this->assertNotNull($this->component->asa('PreBarBehavior'));
 
-    $this->assertFalse($this->component->isa('FooFooBehavior'));
-    $this->assertFalse($this->component->isa('FooBehavior'));
-    $this->assertFalse($this->component->isa('BarBehavior'));
-    $this->assertFalse($this->component->isa('FooBarBehavior'));
-    $this->assertTrue($this->component->isa('PreBarBehavior'));
+	$this->assertFalse($this->component->isa('FooFooBehavior'));
+	$this->assertFalse($this->component->isa('FooBehavior'));
+	$this->assertFalse($this->component->isa('BarBehavior'));
+	$this->assertFalse($this->component->isa('FooBarBehavior'));
+	$this->assertTrue($this->component->isa('PreBarBehavior'));
 
 
 
-    //	testing if we can detachBehaviors just by the name of the behavior instead of an array of the behavior
-    $this->component->attachBehaviors(array('FooFooBehavior' => new FooFooBehavior, 'BarBehavior' => new BarBehavior));
+	//	testing if we can detachBehaviors just by the name of the behavior instead of an array of the behavior
+	$this->component->attachBehaviors(array('FooFooBehavior' => new FooFooBehavior, 'BarBehavior' => new BarBehavior));
 
-    $this->assertTrue($this->component->isa('FooBehavior'));
-    $this->assertTrue($this->component->isa('BarBehavior'));
+	$this->assertTrue($this->component->isa('FooBehavior'));
+	$this->assertTrue($this->component->isa('BarBehavior'));
 
-    $this->component->detachBehaviors(array('FooFooBehavior', 'BarBehavior'));
+	$this->component->detachBehaviors(array('FooFooBehavior', 'BarBehavior'));
 
-    $this->assertNull($this->component->asa('FooBehavior'));
-    $this->assertNull($this->component->asa('FooFooBehavior'));
-    $this->assertNull($this->component->asa('BarBehavior'));
-    $this->assertNull($this->component->asa('FooBarBehavior'));
+	$this->assertNull($this->component->asa('FooBehavior'));
+	$this->assertNull($this->component->asa('FooFooBehavior'));
+	$this->assertNull($this->component->asa('BarBehavior'));
+	$this->assertNull($this->component->asa('FooBarBehavior'));
 
-    $this->assertFalse($this->component->isa('FooFooBehavior'));
-    $this->assertFalse($this->component->isa('FooBehavior'));
-    $this->assertFalse($this->component->isa('BarBehavior'));
-    $this->assertFalse($this->component->isa('FooBarBehavior'));
+	$this->assertFalse($this->component->isa('FooFooBehavior'));
+	$this->assertFalse($this->component->isa('FooBehavior'));
+	$this->assertFalse($this->component->isa('BarBehavior'));
+	$this->assertFalse($this->component->isa('FooBarBehavior'));
   }
 
 
   public function testClearBehaviors() {
 
-    $this->assertNull($this->component->asa('FooBehavior'));
-    $this->assertNull($this->component->asa('BarBehavior'));
-    $this->assertNull($this->component->asa('FooBarBehavior'));
-    $this->assertNull($this->component->asa('PreBarBehavior'));
+	$this->assertNull($this->component->asa('FooBehavior'));
+	$this->assertNull($this->component->asa('BarBehavior'));
+	$this->assertNull($this->component->asa('FooBarBehavior'));
+	$this->assertNull($this->component->asa('PreBarBehavior'));
 
-    $this->component->attachBehaviors(array('FooFooBehavior' => new FooFooBehavior, 'BarBehavior' => new BarBehavior, 'PreBarBehavior' => new PreBarBehavior));
+	$this->component->attachBehaviors(array('FooFooBehavior' => new FooFooBehavior, 'BarBehavior' => new BarBehavior, 'PreBarBehavior' => new PreBarBehavior));
 
-    $this->assertNull($this->component->asa('FooBehavior'));
-    $this->assertNotNull($this->component->asa('FooFooBehavior'));
-    $this->assertNotNull($this->component->asa('BarBehavior'));
-    $this->assertNull($this->component->asa('FooBarBehavior'));
-    $this->assertNotNull($this->component->asa('PreBarBehavior'));
+	$this->assertNull($this->component->asa('FooBehavior'));
+	$this->assertNotNull($this->component->asa('FooFooBehavior'));
+	$this->assertNotNull($this->component->asa('BarBehavior'));
+	$this->assertNull($this->component->asa('FooBarBehavior'));
+	$this->assertNotNull($this->component->asa('PreBarBehavior'));
 
-    $this->component->clearBehaviors();
+	$this->component->clearBehaviors();
 
-    $this->assertNull($this->component->asa('FooBehavior'));
-    $this->assertNull($this->component->asa('BarBehavior'));
-    $this->assertNull($this->component->asa('FooBarBehavior'));
-    $this->assertNull($this->component->asa('PreBarBehavior'));
+	$this->assertNull($this->component->asa('FooBehavior'));
+	$this->assertNull($this->component->asa('BarBehavior'));
+	$this->assertNull($this->component->asa('FooBarBehavior'));
+	$this->assertNull($this->component->asa('PreBarBehavior'));
   }
 
   public function testEnableDisableBehavior() {
 
-    $this->assertNull($this->component->enableBehavior('FooBehavior'));
-    $this->assertNull($this->component->disableBehavior('FooBehavior'));
+	$this->assertNull($this->component->enableBehavior('FooBehavior'));
+	$this->assertNull($this->component->disableBehavior('FooBehavior'));
 
-    try {
+	try {
 	  $this->component->faaEverMore(true, true);
-      $this->fail('TApplicationException not raised trying to execute a undefined class method');
-    } catch(TApplicationException $e) {}
+	  $this->fail('TApplicationException not raised trying to execute a undefined class method');
+	} catch(TApplicationException $e) {}
 
-    $this->component->attachBehavior('FooBehavior', new FooBehavior);
+	$this->component->attachBehavior('FooBehavior', new FooBehavior);
 
-    $this->assertTrue($this->component->isa('FooBehavior'));
-    try {
-	    $this->assertTrue($this->component->faaEverMore(true, true));
-    } catch(TApplicationException $e) {
-      $this->fail('TApplicationException raised while trying to execute a behavior class method');
-    }
+	$this->assertTrue($this->component->isa('FooBehavior'));
+	try {
+		$this->assertTrue($this->component->faaEverMore(true, true));
+	} catch(TApplicationException $e) {
+	  $this->fail('TApplicationException raised while trying to execute a behavior class method');
+	}
 
-    $this->assertTrue($this->component->disableBehavior('FooBehavior'));
+	$this->assertTrue($this->component->disableBehavior('FooBehavior'));
 
-    $this->assertFalse($this->component->isa('FooBehavior'));
+	$this->assertFalse($this->component->isa('FooBehavior'));
 
-    try {
+	try {
 	  $this->component->faaEverMore(true, true);
-      $this->fail('TApplicationException not raised trying to execute a undefined class method');
-    } catch(TApplicationException $e) {}
+	  $this->fail('TApplicationException not raised trying to execute a undefined class method');
+	} catch(TApplicationException $e) {}
 
-    $this->assertTrue($this->component->enableBehavior('FooBehavior'));
+	$this->assertTrue($this->component->enableBehavior('FooBehavior'));
 
-    $this->assertTrue($this->component->isa('FooBehavior'));
-    try {
-	    $this->assertTrue($this->component->faaEverMore(true, true));
-    } catch(TApplicationException $e) {
-      $this->fail('TApplicationException raised while trying to execute a behavior class method');
-    }
+	$this->assertTrue($this->component->isa('FooBehavior'));
+	try {
+		$this->assertTrue($this->component->faaEverMore(true, true));
+	} catch(TApplicationException $e) {
+	  $this->fail('TApplicationException raised while trying to execute a behavior class method');
+	}
 
 
 
-    $this->assertNull($this->component->enableBehavior('BarClassBehavior'));
-    $this->assertNull($this->component->disableBehavior('BarClassBehavior'));
+	$this->assertNull($this->component->enableBehavior('BarClassBehavior'));
+	$this->assertNull($this->component->disableBehavior('BarClassBehavior'));
 
-    try {
+	try {
 	  $this->component->moreFunction(true, true);
-      $this->fail('TApplicationException not raised trying to execute an undefined class method');
-    } catch(TApplicationException $e) {}
+	  $this->fail('TApplicationException not raised trying to execute an undefined class method');
+	} catch(TApplicationException $e) {}
 
-    $this->component->attachClassBehavior('BarClassBehavior', new BarClassBehavior);
+	$this->component->attachClassBehavior('BarClassBehavior', new BarClassBehavior);
 
-    $this->assertFalse($this->component->enableBehavior('BarClassBehavior'));
-    $this->assertFalse($this->component->disableBehavior('BarClassBehavior'));
+	$this->assertFalse($this->component->enableBehavior('BarClassBehavior'));
+	$this->assertFalse($this->component->disableBehavior('BarClassBehavior'));
 
-    try {
-	    $this->assertTrue($this->component->moreFunction(true, true));
-    } catch(TApplicationException $e) {
-      $this->fail('TApplicationException raised while trying to execute a behavior class method');
-    }
+	try {
+		$this->assertTrue($this->component->moreFunction(true, true));
+	} catch(TApplicationException $e) {
+	  $this->fail('TApplicationException raised while trying to execute a behavior class method');
+	}
 
-    $this->component->detachClassBehavior('BarClassBehavior');
+	$this->component->detachClassBehavior('BarClassBehavior');
   }
 
 
   public function testBehaviorFunctionCalls() {
 
-    $this->component->attachBehavior('FooBarBehavior', $behavior = new FooBarBehavior);
-    $this->component->attachClassBehavior('FooClassBehavior', $classbehavior = new FooClassBehavior);
+	$this->component->attachBehavior('FooBarBehavior', $behavior = new FooBarBehavior);
+	$this->component->attachClassBehavior('FooClassBehavior', $classbehavior = new FooClassBehavior);
 
-    // Test the Class Methods
-    $this->assertEquals(12, $this->component->faaEverMore(3, 4));
+	// Test the Class Methods
+	$this->assertEquals(12, $this->component->faaEverMore(3, 4));
 
-    // Check that the called object is shifted in front of the array of a class behavior call
-    $this->assertEquals($this->component, $this->component->getLastClassObject());
+	// Check that the called object is shifted in front of the array of a class behavior call
+	$this->assertEquals($this->component, $this->component->getLastClassObject());
 
 
-    //Test the FooBarBehavior
-    $this->assertEquals(27, $this->component->moreFunction(3, 3));
+	//Test the FooBarBehavior
+	$this->assertEquals(27, $this->component->moreFunction(3, 3));
 
-    $this->assertTrue($this->component->disableBehavior('FooBarBehavior'));
-    try {
-	    $this->assertNull($this->component->moreFunction(3, 4));
-      	$this->fail('TApplicationException not raised trying to execute a disabled behavior');
-    } catch(TApplicationException $e) {}
-    $this->assertTrue($this->component->enableBehavior('FooBarBehavior'));
+	$this->assertTrue($this->component->disableBehavior('FooBarBehavior'));
+	try {
+		$this->assertNull($this->component->moreFunction(3, 4));
+	  	$this->fail('TApplicationException not raised trying to execute a disabled behavior');
+	} catch(TApplicationException $e) {}
+	$this->assertTrue($this->component->enableBehavior('FooBarBehavior'));
 
 	// Test the global event space, this should work and return false because no function implements these methods
-    $this->assertNull($this->component->fxSomeUndefinedGlobalEvent());
-    $this->assertNull($this->component->dySomeUndefinedIntraObjectEvent());
+	$this->assertNull($this->component->fxSomeUndefinedGlobalEvent());
+	$this->assertNull($this->component->dySomeUndefinedIntraObjectEvent());
 
-    $this->component->detachClassBehavior('FooClassBehavior');
+	$this->component->detachClassBehavior('FooClassBehavior');
 
 
 
-    // test object instance behaviors implemented through class-wide behaviors
-    $this->component->attachClassBehavior('FooFooBehaviorAsClass', 'FooFooBehavior');
+	// test object instance behaviors implemented through class-wide behaviors
+	$this->component->attachClassBehavior('FooFooBehaviorAsClass', 'FooFooBehavior');
 
-    $component = new NewComponent;
+	$component = new NewComponent;
 
-    $this->assertEquals(5, $this->component->faafaaEverMore(3, 4));
-    $this->assertEquals(10, $component->faafaaEverMore(6, 8));
+	$this->assertEquals(5, $this->component->faafaaEverMore(3, 4));
+	$this->assertEquals(10, $component->faafaaEverMore(6, 8));
 
-    $this->component->detachClassBehavior('FooFooBehaviorAsClass');
-    $component->unlisten();
-    $component = null;
+	$this->component->detachClassBehavior('FooFooBehaviorAsClass');
+	$component->unlisten();
+	$component = null;
 
-    try {
-    	$this->component->faafaaEverMore(3, 4);
-      	$this->fail('TApplicationException not raised trying to execute a disabled behavior');
-    } catch(TApplicationException $e) {}
+	try {
+		$this->component->faafaaEverMore(3, 4);
+	  	$this->fail('TApplicationException not raised trying to execute a disabled behavior');
+	} catch(TApplicationException $e) {}
 
 
 
-    // make a call to an unpatched fx and dy call so that it's passed through to the __dycall function
-    $dynamicComponent = new DynamicCallComponent;
+	// make a call to an unpatched fx and dy call so that it's passed through to the __dycall function
+	$dynamicComponent = new DynamicCallComponent;
 
-    $this->assertNull($dynamicComponent->fxUndefinedEvent());
-    $this->assertNull($dynamicComponent->dyUndefinedEvent());
+	$this->assertNull($dynamicComponent->fxUndefinedEvent());
+	$this->assertNull($dynamicComponent->dyUndefinedEvent());
 
-    //This tests the dynamic __dycall function
-    $this->assertEquals(1024, $dynamicComponent->dyPowerFunction(2, 10));
-    $this->assertEquals(5, $dynamicComponent->dyDivisionFunction(10, 2));
+	//This tests the dynamic __dycall function
+	$this->assertEquals(1024, $dynamicComponent->dyPowerFunction(2, 10));
+	$this->assertEquals(5, $dynamicComponent->dyDivisionFunction(10, 2));
 
-    $this->assertEquals(2048, $dynamicComponent->fxPowerFunction(2, 10));
-    $this->assertEquals(10, $dynamicComponent->fxDivisionFunction(10, 2));
+	$this->assertEquals(2048, $dynamicComponent->fxPowerFunction(2, 10));
+	$this->assertEquals(10, $dynamicComponent->fxDivisionFunction(10, 2));
 
-    $dynamicComponent->unlisten();
+	$dynamicComponent->unlisten();
 
   }
 
 
   public function testHasProperty() {
-    $this->assertTrue($this->component->hasProperty('Text'), "Component hasn't property Text");
-    $this->assertTrue($this->component->hasProperty('text'), "Component hasn't property text");
-    $this->assertFalse($this->component->hasProperty('Caption'), "Component has property Caption");
-
-    $this->assertTrue($this->component->hasProperty('ColorAttribute'), "Component hasn't property JsColorAttribute");
-    $this->assertTrue($this->component->hasProperty('colorattribute'), "Component hasn't property JsColorAttribute");
-    $this->assertFalse($this->component->canGetProperty('PastelAttribute'), "Component has property JsPastelAttribute");
-
-    $this->assertTrue($this->component->hasProperty('JSColorAttribute'), "Component hasn't property JsColorAttribute");
-    $this->assertTrue($this->component->hasProperty('jscolorattribute'), "Component hasn't property JsColorAttribute");
-    $this->assertFalse($this->component->hasProperty('jsPastelAttribute'), "Component has property JsPastelAttribute");
-
-    $this->assertFalse($this->component->hasProperty('Excitement'), "Component has property Excitement");
-    $this->component->attachBehavior('ExcitementPropBehavior', new BehaviorTestBehavior);
-    $this->assertTrue($this->component->hasProperty('Excitement'), "Component hasn't property Excitement");
-    $this->component->disableBehaviors();
-    $this->assertFalse($this->component->hasProperty('Excitement'), "Component has property Excitement");
-    $this->component->enableBehaviors();
-    $this->assertTrue($this->component->hasProperty('Excitement'), "Component hasn't property Excitement");
-    $this->component->disableBehavior('ExcitementPropBehavior');
-    $this->assertFalse($this->component->hasProperty('Excitement'), "Component has property Excitement");
-    $this->component->enableBehavior('ExcitementPropBehavior');
-    $this->assertTrue($this->component->hasProperty('Excitement'), "Component hasn't property Excitement");
-
-    $this->component->detachBehavior('ExcitementPropBehavior');
-
-    $this->assertFalse($this->component->hasProperty('Excitement'), "Component has property Excitement");
+	$this->assertTrue($this->component->hasProperty('Text'), "Component hasn't property Text");
+	$this->assertTrue($this->component->hasProperty('text'), "Component hasn't property text");
+	$this->assertFalse($this->component->hasProperty('Caption'), "Component has property Caption");
+
+	$this->assertTrue($this->component->hasProperty('ColorAttribute'), "Component hasn't property JsColorAttribute");
+	$this->assertTrue($this->component->hasProperty('colorattribute'), "Component hasn't property JsColorAttribute");
+	$this->assertFalse($this->component->canGetProperty('PastelAttribute'), "Component has property JsPastelAttribute");
+
+	$this->assertTrue($this->component->hasProperty('JSColorAttribute'), "Component hasn't property JsColorAttribute");
+	$this->assertTrue($this->component->hasProperty('jscolorattribute'), "Component hasn't property JsColorAttribute");
+	$this->assertFalse($this->component->hasProperty('jsPastelAttribute'), "Component has property JsPastelAttribute");
+
+	$this->assertFalse($this->component->hasProperty('Excitement'), "Component has property Excitement");
+	$this->component->attachBehavior('ExcitementPropBehavior', new BehaviorTestBehavior);
+	$this->assertTrue($this->component->hasProperty('Excitement'), "Component hasn't property Excitement");
+	$this->component->disableBehaviors();
+	$this->assertFalse($this->component->hasProperty('Excitement'), "Component has property Excitement");
+	$this->component->enableBehaviors();
+	$this->assertTrue($this->component->hasProperty('Excitement'), "Component hasn't property Excitement");
+	$this->component->disableBehavior('ExcitementPropBehavior');
+	$this->assertFalse($this->component->hasProperty('Excitement'), "Component has property Excitement");
+	$this->component->enableBehavior('ExcitementPropBehavior');
+	$this->assertTrue($this->component->hasProperty('Excitement'), "Component hasn't property Excitement");
+
+	$this->component->detachBehavior('ExcitementPropBehavior');
+
+	$this->assertFalse($this->component->hasProperty('Excitement'), "Component has property Excitement");
 
   }
 
   public function testCanGetProperty() {
-    $this->assertTrue($this->component->canGetProperty('Text'));
-    $this->assertTrue($this->component->canGetProperty('text'));
-    $this->assertFalse($this->component->canGetProperty('Caption'));
-
-    $this->assertTrue($this->component->canGetProperty('ColorAttribute'));
-    $this->assertTrue($this->component->canGetProperty('colorattribute'));
-    $this->assertFalse($this->component->canGetProperty('PastelAttribute'));
-
-    $this->assertTrue($this->component->canGetProperty('JSColorAttribute'));
-    $this->assertTrue($this->component->canGetProperty('jscolorattribute'));
-    $this->assertFalse($this->component->canGetProperty('jsPastelAttribute'));
-
-
-    $this->assertFalse($this->component->canGetProperty('Excitement'), "Component has property Excitement");
-    $this->component->attachBehavior('ExcitementPropBehavior', new BehaviorTestBehavior);
-    $this->assertTrue($this->component->canGetProperty('Excitement'), "Component hasn't property Excitement");
-    $this->component->disableBehaviors();
-    $this->assertFalse($this->component->canGetProperty('Excitement'), "Component has property Excitement");
-    $this->component->enableBehaviors();
-    $this->assertTrue($this->component->canGetProperty('Excitement'), "Component hasn't property Excitement");
-    $this->component->disableBehavior('ExcitementPropBehavior');
-    $this->assertFalse($this->component->canGetProperty('Excitement'), "Component has property Excitement");
-    $this->component->enableBehavior('ExcitementPropBehavior');
-    $this->assertTrue($this->component->canGetProperty('Excitement'), "Component hasn't property Excitement");
-
-    $this->component->detachBehavior('ExcitementPropBehavior');
-
-    $this->assertFalse($this->component->canGetProperty('Excitement'), "Component has property Excitement");
+	$this->assertTrue($this->component->canGetProperty('Text'));
+	$this->assertTrue($this->component->canGetProperty('text'));
+	$this->assertFalse($this->component->canGetProperty('Caption'));
+
+	$this->assertTrue($this->component->canGetProperty('ColorAttribute'));
+	$this->assertTrue($this->component->canGetProperty('colorattribute'));
+	$this->assertFalse($this->component->canGetProperty('PastelAttribute'));
+
+	$this->assertTrue($this->component->canGetProperty('JSColorAttribute'));
+	$this->assertTrue($this->component->canGetProperty('jscolorattribute'));
+	$this->assertFalse($this->component->canGetProperty('jsPastelAttribute'));
+
+
+	$this->assertFalse($this->component->canGetProperty('Excitement'), "Component has property Excitement");
+	$this->component->attachBehavior('ExcitementPropBehavior', new BehaviorTestBehavior);
+	$this->assertTrue($this->component->canGetProperty('Excitement'), "Component hasn't property Excitement");
+	$this->component->disableBehaviors();
+	$this->assertFalse($this->component->canGetProperty('Excitement'), "Component has property Excitement");
+	$this->component->enableBehaviors();
+	$this->assertTrue($this->component->canGetProperty('Excitement'), "Component hasn't property Excitement");
+	$this->component->disableBehavior('ExcitementPropBehavior');
+	$this->assertFalse($this->component->canGetProperty('Excitement'), "Component has property Excitement");
+	$this->component->enableBehavior('ExcitementPropBehavior');
+	$this->assertTrue($this->component->canGetProperty('Excitement'), "Component hasn't property Excitement");
+
+	$this->component->detachBehavior('ExcitementPropBehavior');
+
+	$this->assertFalse($this->component->canGetProperty('Excitement'), "Component has property Excitement");
   }
 
   public function testCanSetProperty() {
-    $this->assertTrue($this->component->canSetProperty('Text'));
-    $this->assertTrue($this->component->canSetProperty('text'));
-    $this->assertFalse($this->component->canSetProperty('Caption'));
-
-    $this->assertTrue($this->component->canSetProperty('ColorAttribute'));
-    $this->assertTrue($this->component->canSetProperty('colorattribute'));
-    $this->assertFalse($this->component->canSetProperty('PastelAttribute'));
-
-    $this->assertTrue($this->component->canSetProperty('JSColorAttribute'));
-    $this->assertTrue($this->component->canSetProperty('jscolorattribute'));
-    $this->assertFalse($this->component->canSetProperty('jsPastelAttribute'));
-
-    $this->assertFalse($this->component->canSetProperty('Excitement'), "Component has property Excitement");
-    $this->component->attachBehavior('ExcitementPropBehavior', new BehaviorTestBehavior);
-    $this->assertTrue($this->component->canSetProperty('Excitement'), "Component hasn't property Excitement");
-    $this->component->disableBehaviors();
-    $this->assertFalse($this->component->canSetProperty('Excitement'), "Component has property Excitement");
-    $this->component->enableBehaviors();
-    $this->assertTrue($this->component->canSetProperty('Excitement'), "Component hasn't property Excitement");
-    $this->component->disableBehavior('ExcitementPropBehavior');
-    $this->assertFalse($this->component->canSetProperty('Excitement'), "Component has property Excitement");
-    $this->component->enableBehavior('ExcitementPropBehavior');
-    $this->assertTrue($this->component->canSetProperty('Excitement'), "Component hasn't property Excitement");
-
-    $this->component->detachBehavior('ExcitementPropBehavior');
+	$this->assertTrue($this->component->canSetProperty('Text'));
+	$this->assertTrue($this->component->canSetProperty('text'));
+	$this->assertFalse($this->component->canSetProperty('Caption'));
+
+	$this->assertTrue($this->component->canSetProperty('ColorAttribute'));
+	$this->assertTrue($this->component->canSetProperty('colorattribute'));
+	$this->assertFalse($this->component->canSetProperty('PastelAttribute'));
+
+	$this->assertTrue($this->component->canSetProperty('JSColorAttribute'));
+	$this->assertTrue($this->component->canSetProperty('jscolorattribute'));
+	$this->assertFalse($this->component->canSetProperty('jsPastelAttribute'));
+
+	$this->assertFalse($this->component->canSetProperty('Excitement'), "Component has property Excitement");
+	$this->component->attachBehavior('ExcitementPropBehavior', new BehaviorTestBehavior);
+	$this->assertTrue($this->component->canSetProperty('Excitement'), "Component hasn't property Excitement");
+	$this->component->disableBehaviors();
+	$this->assertFalse($this->component->canSetProperty('Excitement'), "Component has property Excitement");
+	$this->component->enableBehaviors();
+	$this->assertTrue($this->component->canSetProperty('Excitement'), "Component hasn't property Excitement");
+	$this->component->disableBehavior('ExcitementPropBehavior');
+	$this->assertFalse($this->component->canSetProperty('Excitement'), "Component has property Excitement");
+	$this->component->enableBehavior('ExcitementPropBehavior');
+	$this->assertTrue($this->component->canSetProperty('Excitement'), "Component hasn't property Excitement");
+
+	$this->component->detachBehavior('ExcitementPropBehavior');
   }
 
   public function testGetProperty() {
-    $this->assertTrue('default'===$this->component->Text);
-    try {
-      $value2=$this->component->Caption;
-      $this->fail('exception not raised when getting undefined property');
-    } catch(TInvalidOperationException $e) {
-    }
+	$this->assertTrue('default'===$this->component->Text);
+	try {
+	  $value2=$this->component->Caption;
+	  $this->fail('exception not raised when getting undefined property');
+	} catch(TInvalidOperationException $e) {
+	}
 
-    $this->assertTrue($this->component->OnMyEvent instanceof TPriorityList);
-    try {
-      $value2=$this->component->onUndefinedEvent;
-      $this->fail('exception not raised when getting undefined property');
-    } catch(TInvalidOperationException $e) {
-    }
+	$this->assertTrue($this->component->OnMyEvent instanceof TPriorityList);
+	try {
+	  $value2=$this->component->onUndefinedEvent;
+	  $this->fail('exception not raised when getting undefined property');
+	} catch(TInvalidOperationException $e) {
+	}
 
-    //Without the function parenthesis, the function is _not_ called but the __get
-    //	method is called and the global events (list) are accessed
-    $this->assertTrue($this->component->fxAttachClassBehavior instanceof TPriorityList);
-    $this->assertTrue($this->component->fxDetachClassBehavior instanceof TPriorityList);
+	//Without the function parenthesis, the function is _not_ called but the __get
+	//	method is called and the global events (list) are accessed
+	$this->assertTrue($this->component->fxAttachClassBehavior instanceof TPriorityList);
+	$this->assertTrue($this->component->fxDetachClassBehavior instanceof TPriorityList);
 
-    // even undefined global events have a list as every object is able to access every event
-    $this->assertTrue($this->component->fxUndefinedEvent instanceof TPriorityList);
+	// even undefined global events have a list as every object is able to access every event
+	$this->assertTrue($this->component->fxUndefinedEvent instanceof TPriorityList);
 
 
-    // Test the behaviors within the __get function
-    $this->component->enableBehaviors();
+	// Test the behaviors within the __get function
+	$this->component->enableBehaviors();
 
-    try {
-      $value2=$this->component->Excitement;
-      $this->fail('exception not raised when getting undefined property');
-    } catch(TInvalidOperationException $e) {
-    }
+	try {
+	  $value2=$this->component->Excitement;
+	  $this->fail('exception not raised when getting undefined property');
+	} catch(TInvalidOperationException $e) {
+	}
 
-    $this->component->attachBehavior('BehaviorTestBehavior', $behavior = new BehaviorTestBehavior);
-    $this->assertEquals('faa', $this->component->Excitement);
+	$this->component->attachBehavior('BehaviorTestBehavior', $behavior = new BehaviorTestBehavior);
+	$this->assertEquals('faa', $this->component->Excitement);
 
-    $this->component->disableBehaviors();
+	$this->component->disableBehaviors();
 
-    try {
-      $this->assertEquals('faa', $this->component->Excitement);
-      $this->fail('exception not raised when getting undefined property');
-    } catch(TInvalidOperationException $e) {
-    }
+	try {
+	  $this->assertEquals('faa', $this->component->Excitement);
+	  $this->fail('exception not raised when getting undefined property');
+	} catch(TInvalidOperationException $e) {
+	}
 
-    $this->component->enableBehaviors();
-    $this->assertEquals('faa', $this->component->getExcitement());
+	$this->component->enableBehaviors();
+	$this->assertEquals('faa', $this->component->getExcitement());
 
-    $this->component->disableBehavior('BehaviorTestBehavior');
+	$this->component->disableBehavior('BehaviorTestBehavior');
 
-    $this->assertEquals($behavior, $this->component->BehaviorTestBehavior);
-    try {
-	      $behavior = $this->component->BehaviorTestBehavior2;
-	      $this->fail('exception not raised when getting undefined property');
-	    } catch(TInvalidOperationException $e) {
-    }
+	$this->assertEquals($behavior, $this->component->BehaviorTestBehavior);
+	try {
+		  $behavior = $this->component->BehaviorTestBehavior2;
+		  $this->fail('exception not raised when getting undefined property');
+		} catch(TInvalidOperationException $e) {
+	}
 
-    try {
-      $this->assertEquals('faa', $this->component->Excitement);
-      $this->fail('exception not raised when getting undefined property');
-    } catch(TInvalidOperationException $e) {
-    }
-    $this->component->enableBehavior('BehaviorTestBehavior');
-    $this->assertEquals('faa', $this->component->getExcitement());
+	try {
+	  $this->assertEquals('faa', $this->component->Excitement);
+	  $this->fail('exception not raised when getting undefined property');
+	} catch(TInvalidOperationException $e) {
+	}
+	$this->component->enableBehavior('BehaviorTestBehavior');
+	$this->assertEquals('faa', $this->component->getExcitement());
 
 
-    // behaviors allow on and fx events to be passed through.
-    $this->assertTrue($this->component->onBehaviorEvent instanceof TPriorityList);
+	// behaviors allow on and fx events to be passed through.
+	$this->assertTrue($this->component->onBehaviorEvent instanceof TPriorityList);
 
   }
 
   public function testSetProperty() {
-    $value='new value';
-    $this->component->Text=$value;
-    $text=$this->component->Text;
-    $this->assertTrue($value===$this->component->Text);
-    try {
-      $this->component->NewMember=$value;
-      $this->fail('exception not raised when setting undefined property');
-    } catch(TInvalidOperationException $e) {
-    }
-
-    // Test get only properties is a set function
-    try {
-      $this->component->ReadOnlyProperty = 'setting read only';
-      $this->fail('a property without a set function was set to a new value without error');
-    } catch(TInvalidOperationException $e) {
-    }
-
-    try {
-      $this->component->ReadOnlyJsProperty = 'jssetting read only';
-      $this->fail('a js property without a set function was set to a new value without error');
-    } catch(TInvalidOperationException $e) {
-    }
-
-    try {
-      $this->component->JsReadOnlyJsProperty = 'jssetting read only';
-      $this->fail('a js property without a set function was set to a new value without error');
-    } catch(TInvalidOperationException $e) {
-    }
-
-    $this->assertEquals(0, $this->component->getEventHandlers('onMyEvent')->getCount());
-    $this->component->onMyEvent = array($this->component,'myEventHandler');
-    $this->assertEquals(1, $this->component->getEventHandlers('onMyEvent')->getCount());
-    $this->component->onMyEvent[] = array($this->component,'Object.myEventHandler');
-    $this->assertEquals(2, $this->component->getEventHandlers('onMyEvent')->getCount());
-
-    $this->component->getEventHandlers('onMyEvent')->clear();
-
-    // Test the behaviors within the __get function
-    $this->component->enableBehaviors();
-
-    try {
-      $this->component->Excitement = 'laa';
-      $this->fail('exception not raised when getting undefined property');
-    } catch(TInvalidOperationException $e) {
-    }
-
-    $this->component->attachBehavior('BehaviorTestBehavior', $behavior1 = new BehaviorTestBehavior);
-    $this->component->Excitement = 'laa';
-    $this->assertEquals('laa', $this->component->Excitement);
-    $this->assertEquals('sol', $this->component->Excitement = 'sol');
-
-
-    $this->component->disableBehaviors();
-
-    try {
-      $this->component->Excitement = false;
-      $this->assertEquals(false, $this->component->Excitement);
-      $this->fail('exception not raised when getting undefined property');
-    } catch(TInvalidOperationException $e) {
-    }
-
-    $this->component->enableBehaviors();
-    $this->component->Excitement = 'faa';
-    $this->assertEquals('faa', $this->component->getExcitement());
-
-    $this->component->disableBehavior('BehaviorTestBehavior');
-
-    try {
-      $this->component->Excitement = false;
-      $this->assertEquals(false, $this->component->Excitement);
-      $this->fail('exception not raised when getting undefined property');
-    } catch(TInvalidOperationException $e) {
-    }
-    $this->component->enableBehavior('BehaviorTestBehavior');
-    $this->component->Excitement = 'sol';
-    $this->assertEquals('sol', $this->component->Excitement);
-
-
-    $this->component->attachBehavior('BehaviorTestBehavior2', $behavior2 = new BehaviorTestBehavior);
-
-    $this->assertEquals('sol', $this->component->Excitement);
-    $this->assertEquals('faa', $behavior2->Excitement);
-
-    // this sets Excitement for both because they are not uniquely named
-    $this->component->Excitement = 'befaad';
-
-    $this->assertEquals('befaad', $this->component->Excitement);
-    $this->assertEquals('befaad', $behavior1->Excitement);
-    $this->assertEquals('befaad', $behavior2->Excitement);
-
-
-    $this->component->detachBehavior('BehaviorTestBehavior2');
-
-    // behaviors allow on and fx events to be passed through.
-    $this->assertTrue($this->component->BehaviorTestBehavior->onBehaviorEvent instanceof TPriorityList);
-
-    $this->assertEquals(0, $this->component->BehaviorTestBehavior->getEventHandlers('onBehaviorEvent')->getCount());
-    $this->component->onBehaviorEvent = array($this->component,'myEventHandler');
-    $this->assertEquals(1, $this->component->BehaviorTestBehavior->getEventHandlers('onBehaviorEvent')->getCount());
-    $this->component->onBehaviorEvent[] = array($this->component,'Object.myEventHandler');
-    $this->assertEquals(2, $this->component->BehaviorTestBehavior->getEventHandlers('onBehaviorEvent')->getCount());
-
-    $this->component->BehaviorTestBehavior->getEventHandlers('onBehaviorEvent')->clear();
+	$value='new value';
+	$this->component->Text=$value;
+	$text=$this->component->Text;
+	$this->assertTrue($value===$this->component->Text);
+	try {
+	  $this->component->NewMember=$value;
+	  $this->fail('exception not raised when setting undefined property');
+	} catch(TInvalidOperationException $e) {
+	}
+
+	// Test get only properties is a set function
+	try {
+	  $this->component->ReadOnlyProperty = 'setting read only';
+	  $this->fail('a property without a set function was set to a new value without error');
+	} catch(TInvalidOperationException $e) {
+	}
+
+	try {
+	  $this->component->ReadOnlyJsProperty = 'jssetting read only';
+	  $this->fail('a js property without a set function was set to a new value without error');
+	} catch(TInvalidOperationException $e) {
+	}
+
+	try {
+	  $this->component->JsReadOnlyJsProperty = 'jssetting read only';
+	  $this->fail('a js property without a set function was set to a new value without error');
+	} catch(TInvalidOperationException $e) {
+	}
+
+	$this->assertEquals(0, $this->component->getEventHandlers('onMyEvent')->getCount());
+	$this->component->onMyEvent = array($this->component,'myEventHandler');
+	$this->assertEquals(1, $this->component->getEventHandlers('onMyEvent')->getCount());
+	$this->component->onMyEvent[] = array($this->component,'Object.myEventHandler');
+	$this->assertEquals(2, $this->component->getEventHandlers('onMyEvent')->getCount());
+
+	$this->component->getEventHandlers('onMyEvent')->clear();
+
+	// Test the behaviors within the __get function
+	$this->component->enableBehaviors();
+
+	try {
+	  $this->component->Excitement = 'laa';
+	  $this->fail('exception not raised when getting undefined property');
+	} catch(TInvalidOperationException $e) {
+	}
+
+	$this->component->attachBehavior('BehaviorTestBehavior', $behavior1 = new BehaviorTestBehavior);
+	$this->component->Excitement = 'laa';
+	$this->assertEquals('laa', $this->component->Excitement);
+	$this->assertEquals('sol', $this->component->Excitement = 'sol');
+
+
+	$this->component->disableBehaviors();
+
+	try {
+	  $this->component->Excitement = false;
+	  $this->assertEquals(false, $this->component->Excitement);
+	  $this->fail('exception not raised when getting undefined property');
+	} catch(TInvalidOperationException $e) {
+	}
+
+	$this->component->enableBehaviors();
+	$this->component->Excitement = 'faa';
+	$this->assertEquals('faa', $this->component->getExcitement());
+
+	$this->component->disableBehavior('BehaviorTestBehavior');
+
+	try {
+	  $this->component->Excitement = false;
+	  $this->assertEquals(false, $this->component->Excitement);
+	  $this->fail('exception not raised when getting undefined property');
+	} catch(TInvalidOperationException $e) {
+	}
+	$this->component->enableBehavior('BehaviorTestBehavior');
+	$this->component->Excitement = 'sol';
+	$this->assertEquals('sol', $this->component->Excitement);
+
+
+	$this->component->attachBehavior('BehaviorTestBehavior2', $behavior2 = new BehaviorTestBehavior);
+
+	$this->assertEquals('sol', $this->component->Excitement);
+	$this->assertEquals('faa', $behavior2->Excitement);
+
+	// this sets Excitement for both because they are not uniquely named
+	$this->component->Excitement = 'befaad';
+
+	$this->assertEquals('befaad', $this->component->Excitement);
+	$this->assertEquals('befaad', $behavior1->Excitement);
+	$this->assertEquals('befaad', $behavior2->Excitement);
+
+
+	$this->component->detachBehavior('BehaviorTestBehavior2');
+
+	// behaviors allow on and fx events to be passed through.
+	$this->assertTrue($this->component->BehaviorTestBehavior->onBehaviorEvent instanceof TPriorityList);
+
+	$this->assertEquals(0, $this->component->BehaviorTestBehavior->getEventHandlers('onBehaviorEvent')->getCount());
+	$this->component->onBehaviorEvent = array($this->component,'myEventHandler');
+	$this->assertEquals(1, $this->component->BehaviorTestBehavior->getEventHandlers('onBehaviorEvent')->getCount());
+	$this->component->onBehaviorEvent[] = array($this->component,'Object.myEventHandler');
+	$this->assertEquals(2, $this->component->BehaviorTestBehavior->getEventHandlers('onBehaviorEvent')->getCount());
+
+	$this->component->BehaviorTestBehavior->getEventHandlers('onBehaviorEvent')->clear();
   }
 
 
   public function testIsSetFunction() {
-    $this->assertTrue(isset($this->component->fxAttachClassBehavior));
-    $this->component->unlisten();
+	$this->assertTrue(isset($this->component->fxAttachClassBehavior));
+	$this->component->unlisten();
 
-    $this->assertFalse(isset($this->component->onMyEvent));
-    $this->assertFalse(isset($this->component->undefinedEvent));
-    $this->assertFalse(isset($this->component->fxAttachClassBehavior));
+	$this->assertFalse(isset($this->component->onMyEvent));
+	$this->assertFalse(isset($this->component->undefinedEvent));
+	$this->assertFalse(isset($this->component->fxAttachClassBehavior));
 
-    $this->assertFalse(isset($this->component->BehaviorTestBehavior));
-    $this->assertFalse(isset($this->component->onBehaviorEvent));
+	$this->assertFalse(isset($this->component->BehaviorTestBehavior));
+	$this->assertFalse(isset($this->component->onBehaviorEvent));
 
-    $this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
+	$this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
 
-    $this->assertTrue(isset($this->component->BehaviorTestBehavior));
-    $this->assertFalse(isset($this->component->onBehaviorEvent));
+	$this->assertTrue(isset($this->component->BehaviorTestBehavior));
+	$this->assertFalse(isset($this->component->onBehaviorEvent));
 
-    $this->component->attachEventHandler('onBehaviorEvent','foo');
-    $this->assertTrue(isset($this->component->onBehaviorEvent));
+	$this->component->attachEventHandler('onBehaviorEvent','foo');
+	$this->assertTrue(isset($this->component->onBehaviorEvent));
 
-    $this->component->attachEventHandler('onMyEvent','foo');
-    $this->assertTrue(isset($this->component->onMyEvent));
+	$this->component->attachEventHandler('onMyEvent','foo');
+	$this->assertTrue(isset($this->component->onMyEvent));
 
-    $this->assertTrue(isset($this->component->Excitement));
-    $this->component->Excitement = null;
-    $this->assertFalse(isset($this->component->Excitement));
-    $this->assertFalse(isset($this->component->UndefinedBehaviorProperty));
+	$this->assertTrue(isset($this->component->Excitement));
+	$this->component->Excitement = null;
+	$this->assertFalse(isset($this->component->Excitement));
+	$this->assertFalse(isset($this->component->UndefinedBehaviorProperty));
 
 
   }
@@ -1391,7 +1391,7 @@ 
 
  	// object events
  	$this->assertEquals(0, $this->component->onMyEvent->Count);
-    $this->component->attachEventHandler('onMyEvent','foo');
+	$this->component->attachEventHandler('onMyEvent','foo');
  	$this->assertEquals(1, $this->component->onMyEvent->Count);
  	unset($this->component->onMyEvent);
  	$this->assertEquals(0, $this->component->onMyEvent->Count);
@@ -1407,10 +1407,10 @@ 
 
   	try {
 	  	unset($this->component->Object);
-    	$this->fail('TInvalidOperationException not raised when unsetting get only property');
+		$this->fail('TInvalidOperationException not raised when unsetting get only property');
   	} catch(TInvalidOperationException $e) {}
 
-    $this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
+	$this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
  	$this->assertTrue($this->component->asa('BehaviorTestBehavior') instanceof BehaviorTestBehavior);
  	$this->assertFalse($this->component->asa('BehaviorTestBehavior2') instanceof BehaviorTestBehavior);
 
@@ -1436,7 +1436,7 @@ 
 
   	try {
 	  	unset($this->component->ReadOnly);
-    	$this->fail('TInvalidOperationException not raised when unsetting get only property');
+		$this->fail('TInvalidOperationException not raised when unsetting get only property');
   	} catch(TInvalidOperationException $e) {}
 
   	$this->component->onBehaviorEvent = 'foo';
@@ -1453,338 +1453,338 @@ 
   }
 
   public function testGetSubProperty() {
-    $this->assertTrue('object text'===$this->component->getSubProperty('Object.Text'));
+	$this->assertTrue('object text'===$this->component->getSubProperty('Object.Text'));
   }
 
   public function testSetSubProperty() {
-    $this->component->setSubProperty('Object.Text','new object text');
-    $this->assertEquals('new object text',$this->component->getSubProperty('Object.Text'));
+	$this->component->setSubProperty('Object.Text','new object text');
+	$this->assertEquals('new object text',$this->component->getSubProperty('Object.Text'));
   }
 
   public function testHasEvent() {
-    $this->assertTrue($this->component->hasEvent('OnMyEvent'));
-    $this->assertTrue($this->component->hasEvent('onmyevent'));
-    $this->assertFalse($this->component->hasEvent('onYourEvent'));
+	$this->assertTrue($this->component->hasEvent('OnMyEvent'));
+	$this->assertTrue($this->component->hasEvent('onmyevent'));
+	$this->assertFalse($this->component->hasEvent('onYourEvent'));
 
-    // fx won't throw an error if any of these fx function are called on an object.
-    //	It is a special prefix event designation that every object responds to all events.
-    $this->assertTrue($this->component->hasEvent('fxAttachClassBehavior'));
-    $this->assertTrue($this->component->hasEvent('fxattachclassbehavior'));
+	// fx won't throw an error if any of these fx function are called on an object.
+	//	It is a special prefix event designation that every object responds to all events.
+	$this->assertTrue($this->component->hasEvent('fxAttachClassBehavior'));
+	$this->assertTrue($this->component->hasEvent('fxattachclassbehavior'));
 
-    $this->assertTrue($this->component->hasEvent('fxNonExistantGlobalEvent'));
-    $this->assertTrue($this->component->hasEvent('fxnonexistantglobalevent'));
+	$this->assertTrue($this->component->hasEvent('fxNonExistantGlobalEvent'));
+	$this->assertTrue($this->component->hasEvent('fxnonexistantglobalevent'));
 
-    $this->assertTrue($this->component->hasEvent('dyNonExistantLocalEvent'));
-    $this->assertTrue($this->component->hasEvent('fxnonexistantlocalevent'));
+	$this->assertTrue($this->component->hasEvent('dyNonExistantLocalEvent'));
+	$this->assertTrue($this->component->hasEvent('fxnonexistantlocalevent'));
 
 
-    //Test behavior events
-    $this->assertFalse($this->component->hasEvent('onBehaviorEvent'));
-    $this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
-    $this->assertTrue($this->component->hasEvent('onBehaviorEvent'));
-    $this->assertTrue($this->component->BehaviorTestBehavior->hasEvent('onBehaviorEvent'));
+	//Test behavior events
+	$this->assertFalse($this->component->hasEvent('onBehaviorEvent'));
+	$this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
+	$this->assertTrue($this->component->hasEvent('onBehaviorEvent'));
+	$this->assertTrue($this->component->BehaviorTestBehavior->hasEvent('onBehaviorEvent'));
 
-    $this->component->disableBehavior('BehaviorTestBehavior');
-    $this->assertFalse($this->component->hasEvent('onBehaviorEvent'));
-    $this->component->enableBehavior('BehaviorTestBehavior');
-    $this->assertTrue($this->component->hasEvent('onBehaviorEvent'));
+	$this->component->disableBehavior('BehaviorTestBehavior');
+	$this->assertFalse($this->component->hasEvent('onBehaviorEvent'));
+	$this->component->enableBehavior('BehaviorTestBehavior');
+	$this->assertTrue($this->component->hasEvent('onBehaviorEvent'));
   }
 
   public function testHasEventHandler() {
-    $this->assertFalse($this->component->hasEventHandler('OnMyEvent'));
-    $this->component->attachEventHandler('OnMyEvent','foo');
-    $this->assertTrue($this->component->hasEventHandler('OnMyEvent'));
-
-    $this->assertFalse($this->component->hasEventHandler('fxNonExistantGlobalEvent'));
-    $this->component->attachEventHandler('fxNonExistantGlobalEvent','foo');
-    $this->assertTrue($this->component->hasEventHandler('fxNonExistantGlobalEvent'));
-
-    //Test behavior events
-    $this->assertFalse($this->component->hasEventHandler('onBehaviorEvent'));
-    $this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
-    $this->assertFalse($this->component->hasEventHandler('onBehaviorEvent'));
-    $this->assertFalse($this->component->BehaviorTestBehavior->hasEventHandler('onBehaviorEvent'));
-
-    $this->component->attachEventHandler('onBehaviorEvent','foo');
-    $this->assertTrue($this->component->hasEventHandler('onBehaviorEvent'));
-
-    $this->component->disableBehavior('BehaviorTestBehavior');
-    $this->assertFalse($this->component->hasEvent('onBehaviorEvent'));
-    $this->assertFalse($this->component->hasEventHandler('onBehaviorEvent'));
-    $this->component->enableBehavior('BehaviorTestBehavior');
-    $this->assertTrue($this->component->hasEvent('onBehaviorEvent'));
-    $this->assertTrue($this->component->hasEventHandler('onBehaviorEvent'));
+	$this->assertFalse($this->component->hasEventHandler('OnMyEvent'));
+	$this->component->attachEventHandler('OnMyEvent','foo');
+	$this->assertTrue($this->component->hasEventHandler('OnMyEvent'));
+
+	$this->assertFalse($this->component->hasEventHandler('fxNonExistantGlobalEvent'));
+	$this->component->attachEventHandler('fxNonExistantGlobalEvent','foo');
+	$this->assertTrue($this->component->hasEventHandler('fxNonExistantGlobalEvent'));
+
+	//Test behavior events
+	$this->assertFalse($this->component->hasEventHandler('onBehaviorEvent'));
+	$this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
+	$this->assertFalse($this->component->hasEventHandler('onBehaviorEvent'));
+	$this->assertFalse($this->component->BehaviorTestBehavior->hasEventHandler('onBehaviorEvent'));
+
+	$this->component->attachEventHandler('onBehaviorEvent','foo');
+	$this->assertTrue($this->component->hasEventHandler('onBehaviorEvent'));
+
+	$this->component->disableBehavior('BehaviorTestBehavior');
+	$this->assertFalse($this->component->hasEvent('onBehaviorEvent'));
+	$this->assertFalse($this->component->hasEventHandler('onBehaviorEvent'));
+	$this->component->enableBehavior('BehaviorTestBehavior');
+	$this->assertTrue($this->component->hasEvent('onBehaviorEvent'));
+	$this->assertTrue($this->component->hasEventHandler('onBehaviorEvent'));
   }
 
   public function testGetEventHandlers() {
-    $list=$this->component->getEventHandlers('OnMyEvent');
-    $this->assertTrue(($list instanceof TPriorityList) && ($list->getCount()===0));
-    $this->component->attachEventHandler('OnMyEvent','foo');
-    $this->assertTrue(($list instanceof TPriorityList) && ($list->getCount()===1));
-    try {
-      $list=$this->component->getEventHandlers('YourEvent');
-      $this->fail('exception not raised when getting event handlers for undefined event');
-    } catch(TInvalidOperationException $e) {
-    }
-
-    $list=$this->component->getEventHandlers('fxRandomEvent');
-    $this->assertTrue(($list instanceof TPriorityList) && ($list->getCount()===0));
-    $this->component->attachEventHandler('fxRandomEvent','foo');
-    $this->assertTrue(($list instanceof TPriorityList) && ($list->getCount()===1));
-    try {
-      $list=$this->component->getEventHandlers('fxSomeUndefinedGlobalEvent');
-    } catch(TInvalidOperationException $e) {
-      $this->fail('exception raised when getting event handlers for universal global event');
-    }
-
-
-
-    //Test behavior events
-    try {
-      $list=$this->component->getEventHandlers('onBehaviorEvent');
-      $this->fail('exception not raised when getting event handlers for undefined event');
-    } catch(TInvalidOperationException $e) {
-    }
-    $this->assertFalse($this->component->hasEventHandler('onBehaviorEvent'));
-
-    $this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
-    $list=$this->component->getEventHandlers('onBehaviorEvent');
-    $this->assertTrue(($list instanceof TPriorityList) && ($list->getCount()===0));
-    $this->component->attachEventHandler('onBehaviorEvent','foo');
-    $this->assertTrue(($list instanceof TPriorityList) && ($list->getCount()===1));
-
-    $this->component->disableBehavior('BehaviorTestBehavior');
-    try {
-      $list=$this->component->getEventHandlers('onBehaviorEvent');
-      $this->fail('exception not raised when getting event handlers for undefined event');
-    } catch(TInvalidOperationException $e) {
-    }
-    $this->component->enableBehavior('BehaviorTestBehavior');
-    $this->assertTrue(($this->component->getEventHandlers('onBehaviorEvent') instanceof TPriorityList) && ($list->getCount()===1));
+	$list=$this->component->getEventHandlers('OnMyEvent');
+	$this->assertTrue(($list instanceof TPriorityList) && ($list->getCount()===0));
+	$this->component->attachEventHandler('OnMyEvent','foo');
+	$this->assertTrue(($list instanceof TPriorityList) && ($list->getCount()===1));
+	try {
+	  $list=$this->component->getEventHandlers('YourEvent');
+	  $this->fail('exception not raised when getting event handlers for undefined event');
+	} catch(TInvalidOperationException $e) {
+	}
+
+	$list=$this->component->getEventHandlers('fxRandomEvent');
+	$this->assertTrue(($list instanceof TPriorityList) && ($list->getCount()===0));
+	$this->component->attachEventHandler('fxRandomEvent','foo');
+	$this->assertTrue(($list instanceof TPriorityList) && ($list->getCount()===1));
+	try {
+	  $list=$this->component->getEventHandlers('fxSomeUndefinedGlobalEvent');
+	} catch(TInvalidOperationException $e) {
+	  $this->fail('exception raised when getting event handlers for universal global event');
+	}
+
+
+
+	//Test behavior events
+	try {
+	  $list=$this->component->getEventHandlers('onBehaviorEvent');
+	  $this->fail('exception not raised when getting event handlers for undefined event');
+	} catch(TInvalidOperationException $e) {
+	}
+	$this->assertFalse($this->component->hasEventHandler('onBehaviorEvent'));
+
+	$this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
+	$list=$this->component->getEventHandlers('onBehaviorEvent');
+	$this->assertTrue(($list instanceof TPriorityList) && ($list->getCount()===0));
+	$this->component->attachEventHandler('onBehaviorEvent','foo');
+	$this->assertTrue(($list instanceof TPriorityList) && ($list->getCount()===1));
+
+	$this->component->disableBehavior('BehaviorTestBehavior');
+	try {
+	  $list=$this->component->getEventHandlers('onBehaviorEvent');
+	  $this->fail('exception not raised when getting event handlers for undefined event');
+	} catch(TInvalidOperationException $e) {
+	}
+	$this->component->enableBehavior('BehaviorTestBehavior');
+	$this->assertTrue(($this->component->getEventHandlers('onBehaviorEvent') instanceof TPriorityList) && ($list->getCount()===1));
 
   }
 
   public function testAttachEventHandler() {
 
-    $this->component->attachEventHandler('OnMyEvent','foo');
-    $this->assertEquals(1, $this->component->getEventHandlers('OnMyEvent')->getCount());
-    try {
-      $this->component->attachEventHandler('YourEvent','foo');
-      $this->fail('exception not raised when attaching event handlers for undefined event');
-    } catch(TInvalidOperationException $e) {
-    }
-
-    //Testing the priorities of attaching events
-    $this->component->attachEventHandler('OnMyEvent','foopre', 5);
-    $this->component->attachEventHandler('OnMyEvent','foopost', 15);
-    $this->component->attachEventHandler('OnMyEvent','foobar', 10);
-    $this->assertEquals(4, $this->component->getEventHandlers('OnMyEvent')->getCount());
-    $list = $this->component->getEventHandlers('OnMyEvent');
-    $this->assertEquals('foopre', $list[0]);
-    $this->assertEquals('foo', $list[1]);
-    $this->assertEquals('foobar', $list[2]);
-    $this->assertEquals('foopost', $list[3]);
-
-
-    //Test attaching behavior events
-    try {
-      $this->component->attachEventHandler('onBehaviorEvent','foo');
-      $this->fail('exception not raised when getting event handlers for undefined event');
-    } catch(TInvalidOperationException $e) {
-    }
-    $this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
-
-    $this->component->attachEventHandler('onBehaviorEvent','foo');
-
-    //Testing the priorities of attaching behavior events
-    $this->component->attachEventHandler('onBehaviorEvent','foopre', 5);
-    $this->component->attachEventHandler('onBehaviorEvent','foopost', 15);
-    $this->component->attachEventHandler('onBehaviorEvent','foobar', 10);
-    $this->component->attachEventHandler('onBehaviorEvent','foobarfoobar', 10);
-    $this->assertEquals(5, $this->component->getEventHandlers('onBehaviorEvent')->getCount());
-    $list = $this->component->getEventHandlers('onBehaviorEvent');
-    $this->assertEquals('foopre', $list[0]);
-    $this->assertEquals('foo', $list[1]);
-    $this->assertEquals('foobar', $list[2]);
-    $this->assertEquals('foobarfoobar', $list[3]);
-    $this->assertEquals('foopost', $list[4]);
-
-    $this->component->disableBehavior('BehaviorTestBehavior');
-    try {
-      $this->component->attachEventHandler('onBehaviorEvent','bar');
-      $this->fail('exception not raised when getting event handlers for undefined event');
-    } catch(TInvalidOperationException $e) {
-    }
-    $this->component->enableBehavior('BehaviorTestBehavior');
+	$this->component->attachEventHandler('OnMyEvent','foo');
+	$this->assertEquals(1, $this->component->getEventHandlers('OnMyEvent')->getCount());
+	try {
+	  $this->component->attachEventHandler('YourEvent','foo');
+	  $this->fail('exception not raised when attaching event handlers for undefined event');
+	} catch(TInvalidOperationException $e) {
+	}
+
+	//Testing the priorities of attaching events
+	$this->component->attachEventHandler('OnMyEvent','foopre', 5);
+	$this->component->attachEventHandler('OnMyEvent','foopost', 15);
+	$this->component->attachEventHandler('OnMyEvent','foobar', 10);
+	$this->assertEquals(4, $this->component->getEventHandlers('OnMyEvent')->getCount());
+	$list = $this->component->getEventHandlers('OnMyEvent');
+	$this->assertEquals('foopre', $list[0]);
+	$this->assertEquals('foo', $list[1]);
+	$this->assertEquals('foobar', $list[2]);
+	$this->assertEquals('foopost', $list[3]);
+
+
+	//Test attaching behavior events
+	try {
+	  $this->component->attachEventHandler('onBehaviorEvent','foo');
+	  $this->fail('exception not raised when getting event handlers for undefined event');
+	} catch(TInvalidOperationException $e) {
+	}
+	$this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
+
+	$this->component->attachEventHandler('onBehaviorEvent','foo');
+
+	//Testing the priorities of attaching behavior events
+	$this->component->attachEventHandler('onBehaviorEvent','foopre', 5);
+	$this->component->attachEventHandler('onBehaviorEvent','foopost', 15);
+	$this->component->attachEventHandler('onBehaviorEvent','foobar', 10);
+	$this->component->attachEventHandler('onBehaviorEvent','foobarfoobar', 10);
+	$this->assertEquals(5, $this->component->getEventHandlers('onBehaviorEvent')->getCount());
+	$list = $this->component->getEventHandlers('onBehaviorEvent');
+	$this->assertEquals('foopre', $list[0]);
+	$this->assertEquals('foo', $list[1]);
+	$this->assertEquals('foobar', $list[2]);
+	$this->assertEquals('foobarfoobar', $list[3]);
+	$this->assertEquals('foopost', $list[4]);
+
+	$this->component->disableBehavior('BehaviorTestBehavior');
+	try {
+	  $this->component->attachEventHandler('onBehaviorEvent','bar');
+	  $this->fail('exception not raised when getting event handlers for undefined event');
+	} catch(TInvalidOperationException $e) {
+	}
+	$this->component->enableBehavior('BehaviorTestBehavior');
 
   }
 
   public function testDetachEventHandler() {
 
-    $this->component->attachEventHandler('OnMyEvent','foo');
-    $this->assertEquals(1, $this->component->getEventHandlers('OnMyEvent')->getCount());
+	$this->component->attachEventHandler('OnMyEvent','foo');
+	$this->assertEquals(1, $this->component->getEventHandlers('OnMyEvent')->getCount());
 
-    $this->component->attachEventHandler('OnMyEvent','foopre', 5);
-    $this->component->attachEventHandler('OnMyEvent','foopost', 15);
-    $this->component->attachEventHandler('OnMyEvent','foobar', 10);
-    $this->component->attachEventHandler('OnMyEvent','foobarfoobar', 10);
+	$this->component->attachEventHandler('OnMyEvent','foopre', 5);
+	$this->component->attachEventHandler('OnMyEvent','foopost', 15);
+	$this->component->attachEventHandler('OnMyEvent','foobar', 10);
+	$this->component->attachEventHandler('OnMyEvent','foobarfoobar', 10);
 
 
 
-    $this->component->detachEventHandler('OnMyEvent','foo');
-    $list = $this->component->getEventHandlers('OnMyEvent');
-    $this->assertEquals(4, $list->getCount());
+	$this->component->detachEventHandler('OnMyEvent','foo');
+	$list = $this->component->getEventHandlers('OnMyEvent');
+	$this->assertEquals(4, $list->getCount());
 
-    $this->assertEquals('foopre', $list[0]);
-    $this->assertEquals('foobar', $list[1]);
-    $this->assertEquals('foobarfoobar', $list[2]);
-    $this->assertEquals('foopost', $list[3]);
+	$this->assertEquals('foopre', $list[0]);
+	$this->assertEquals('foobar', $list[1]);
+	$this->assertEquals('foobarfoobar', $list[2]);
+	$this->assertEquals('foopost', $list[3]);
 
-    $this->component->detachEventHandler('OnMyEvent','foopre', null);
-    $this->assertEquals(4, $list->getCount());
+	$this->component->detachEventHandler('OnMyEvent','foopre', null);
+	$this->assertEquals(4, $list->getCount());
 
-    $this->component->detachEventHandler('OnMyEvent','foopre', 5);
-    $this->assertEquals(3, $list->getCount());
+	$this->component->detachEventHandler('OnMyEvent','foopre', 5);
+	$this->assertEquals(3, $list->getCount());
 
 
-    // Now do detaching of behavior on events
-    try {
-      $this->component->attachEventHandler('onBehaviorEvent','foo');
-      $this->fail('exception not raised when getting event handlers for undefined event');
-    } catch(TInvalidOperationException $e) {
-    }
-    $this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
+	// Now do detaching of behavior on events
+	try {
+	  $this->component->attachEventHandler('onBehaviorEvent','foo');
+	  $this->fail('exception not raised when getting event handlers for undefined event');
+	} catch(TInvalidOperationException $e) {
+	}
+	$this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
 
-    $this->component->attachEventHandler('onBehaviorEvent','foo');
-    $this->assertEquals(1, $this->component->getEventHandlers('onBehaviorEvent')->getCount());
+	$this->component->attachEventHandler('onBehaviorEvent','foo');
+	$this->assertEquals(1, $this->component->getEventHandlers('onBehaviorEvent')->getCount());
 
-    $this->component->attachEventHandler('onBehaviorEvent','foopre', 5);
-    $this->component->attachEventHandler('onBehaviorEvent','foopost', 15);
-    $this->component->attachEventHandler('onBehaviorEvent','foobar', 10);
-    $this->component->attachEventHandler('onBehaviorEvent','foobarfoobar', 10);
+	$this->component->attachEventHandler('onBehaviorEvent','foopre', 5);
+	$this->component->attachEventHandler('onBehaviorEvent','foopost', 15);
+	$this->component->attachEventHandler('onBehaviorEvent','foobar', 10);
+	$this->component->attachEventHandler('onBehaviorEvent','foobarfoobar', 10);
 
 
 
-    $this->component->detachEventHandler('onBehaviorEvent','foo');
-    $list = $this->component->getEventHandlers('onBehaviorEvent');
-    $this->assertEquals(4, $list->getCount());
+	$this->component->detachEventHandler('onBehaviorEvent','foo');
+	$list = $this->component->getEventHandlers('onBehaviorEvent');
+	$this->assertEquals(4, $list->getCount());
 
-    $this->assertEquals('foopre', $list[0]);
-    $this->assertEquals('foobar', $list[1]);
-    $this->assertEquals('foobarfoobar', $list[2]);
-    $this->assertEquals('foopost', $list[3]);
+	$this->assertEquals('foopre', $list[0]);
+	$this->assertEquals('foobar', $list[1]);
+	$this->assertEquals('foobarfoobar', $list[2]);
+	$this->assertEquals('foopost', $list[3]);
 
-    $this->component->detachEventHandler('onBehaviorEvent','foopre', null);
-    $this->assertEquals(4, $list->getCount());
+	$this->component->detachEventHandler('onBehaviorEvent','foopre', null);
+	$this->assertEquals(4, $list->getCount());
 
-    $this->component->detachEventHandler('onBehaviorEvent','foopre', 5);
-    $this->assertEquals(3, $list->getCount());
+	$this->component->detachEventHandler('onBehaviorEvent','foopre', 5);
+	$this->assertEquals(3, $list->getCount());
   }
 
 
 
 
   public function testRaiseEvent() {
-    $this->component->attachEventHandler('OnMyEvent',array($this->component,'myEventHandler'));
-    $this->assertFalse($this->component->isEventHandled());
-    $this->component->raiseEvent('OnMyEvent',$this,null);
-    $this->assertTrue($this->component->isEventHandled());
-    $this->component->attachEventHandler('OnMyEvent',array($this->component,'Object.myEventHandler'));
-    $this->assertFalse($this->component->Object->isEventHandled());
-    $this->component->raiseEvent('OnMyEvent',$this,null);
-    $this->assertTrue($this->component->Object->isEventHandled());
+	$this->component->attachEventHandler('OnMyEvent',array($this->component,'myEventHandler'));
+	$this->assertFalse($this->component->isEventHandled());
+	$this->component->raiseEvent('OnMyEvent',$this,null);
+	$this->assertTrue($this->component->isEventHandled());
+	$this->component->attachEventHandler('OnMyEvent',array($this->component,'Object.myEventHandler'));
+	$this->assertFalse($this->component->Object->isEventHandled());
+	$this->component->raiseEvent('OnMyEvent',$this,null);
+	$this->assertTrue($this->component->Object->isEventHandled());
 
-    $this->component->resetEventHandled();
-    $this->component->Object->resetEventHandled();
+	$this->component->resetEventHandled();
+	$this->component->Object->resetEventHandled();
 
 
-    // Test a behavior on event
-    $this->component->attachBehavior('test', new BehaviorTestBehavior);
+	// Test a behavior on event
+	$this->component->attachBehavior('test', new BehaviorTestBehavior);
 
-    $this->component->attachEventHandler('onBehaviorEvent',array($this->component,'myEventHandler'));
-    $this->assertFalse($this->component->isEventHandled());
-    $this->component->raiseEvent('onBehaviorEvent',$this,null);
-    $this->assertTrue($this->component->isEventHandled());
-    $this->component->attachEventHandler('onBehaviorEvent',array($this->component,'Object.myEventHandler'));
-    $this->assertFalse($this->component->Object->isEventHandled());
-    $this->component->raiseEvent('onBehaviorEvent',$this,null);
-    $this->assertTrue($this->component->Object->isEventHandled());
+	$this->component->attachEventHandler('onBehaviorEvent',array($this->component,'myEventHandler'));
+	$this->assertFalse($this->component->isEventHandled());
+	$this->component->raiseEvent('onBehaviorEvent',$this,null);
+	$this->assertTrue($this->component->isEventHandled());
+	$this->component->attachEventHandler('onBehaviorEvent',array($this->component,'Object.myEventHandler'));
+	$this->assertFalse($this->component->Object->isEventHandled());
+	$this->component->raiseEvent('onBehaviorEvent',$this,null);
+	$this->assertTrue($this->component->Object->isEventHandled());
 
-    //test behavior enabled/disabled events
-    $this->component->disableBehavior('test');
+	//test behavior enabled/disabled events
+	$this->component->disableBehavior('test');
 
-    $this->component->resetEventHandled();
-    $this->component->Object->resetEventHandled();
+	$this->component->resetEventHandled();
+	$this->component->Object->resetEventHandled();
 
-    try {
-    	$this->component->attachEventHandler('onBehaviorEvent',array($this->component,'myEventHandler'));
-      $this->fail('exception not raised when getting event handlers for undefined event');
-    } catch(TInvalidOperationException $e) {}
-    $this->assertFalse($this->component->isEventHandled());
-    try {
-      $this->component->raiseEvent('onBehaviorEvent',$this,null);
-      $this->fail('exception not raised when getting event handlers for undefined event');
-    } catch(TInvalidOperationException $e) {}
-    $this->assertFalse($this->component->isEventHandled());
+	try {
+		$this->component->attachEventHandler('onBehaviorEvent',array($this->component,'myEventHandler'));
+	  $this->fail('exception not raised when getting event handlers for undefined event');
+	} catch(TInvalidOperationException $e) {}
+	$this->assertFalse($this->component->isEventHandled());
+	try {
+	  $this->component->raiseEvent('onBehaviorEvent',$this,null);
+	  $this->fail('exception not raised when getting event handlers for undefined event');
+	} catch(TInvalidOperationException $e) {}
+	$this->assertFalse($this->component->isEventHandled());
 
-    $this->component->enableBehavior('test');
+	$this->component->enableBehavior('test');
 
 
 
-    //Test the return types of this function
+	//Test the return types of this function
 
-    $this->assertFalse($this->component->isEventHandled());
-    $this->assertFalse($this->component->Object->isEventHandled());
-    $this->assertEquals(array(), $this->component->onBehaviorEvent($this,$this->component));
-    $this->assertTrue($this->component->isEventHandled());
-    $this->assertTrue($this->component->Object->isEventHandled());
+	$this->assertFalse($this->component->isEventHandled());
+	$this->assertFalse($this->component->Object->isEventHandled());
+	$this->assertEquals(array(), $this->component->onBehaviorEvent($this,$this->component));
+	$this->assertTrue($this->component->isEventHandled());
+	$this->assertTrue($this->component->Object->isEventHandled());
 
-    // This accumulates all the responses from each of the events
-    $arr=$this->component->onBehaviorEvent($this, $this->component, TEventResults::EVENT_RESULT_ALL);
-    $this->assertEquals($this, $arr[0]['sender']);
-    $this->assertEquals($this->component, $arr[0]['param']);
-    $this->assertTrue(null === $arr[0]['response']);
+	// This accumulates all the responses from each of the events
+	$arr=$this->component->onBehaviorEvent($this, $this->component, TEventResults::EVENT_RESULT_ALL);
+	$this->assertEquals($this, $arr[0]['sender']);
+	$this->assertEquals($this->component, $arr[0]['param']);
+	$this->assertTrue(null === $arr[0]['response']);
 
-    $this->assertEquals($this, $arr[1]['sender']);
-    $this->assertEquals($this->component, $arr[1]['param']);
-    $this->assertTrue(null === $arr[1]['response']);
+	$this->assertEquals($this, $arr[1]['sender']);
+	$this->assertEquals($this->component, $arr[1]['param']);
+	$this->assertTrue(null === $arr[1]['response']);
 
-    $this->assertEquals(2, count($arr));
+	$this->assertEquals(2, count($arr));
 
-    // This tests without the default filtering-out of null
-    $arr=$this->component->onBehaviorEvent($this, $this->component, false);
-    $this->assertEquals(array(null, null), $arr);
+	// This tests without the default filtering-out of null
+	$arr=$this->component->onBehaviorEvent($this, $this->component, false);
+	$this->assertEquals(array(null, null), $arr);
 
 
-    unset($this->component->onBehaviorEvent);
-    $this->assertEquals(0, $this->component->onBehaviorEvent->Count);
+	unset($this->component->onBehaviorEvent);
+	$this->assertEquals(0, $this->component->onBehaviorEvent->Count);
 
-    $this->component->onBehaviorEvent = array($this, 'returnValue4');
-    $this->component->onBehaviorEvent = array($this, 'returnValue1');
+	$this->component->onBehaviorEvent = array($this, 'returnValue4');
+	$this->component->onBehaviorEvent = array($this, 'returnValue1');
 
-    // Test the per event post processing function
-    $arr=$this->component->onBehaviorEvent($this, $this->component, array($this, 'postEventFunction'));
-    $this->assertEquals(array(exp(4), exp(1)), $arr);
-    $arr=$this->component->onBehaviorEvent($this, $this->component, array($this, 'postEventFunction2'));
-    $this->assertEquals(array(sin(4), sin(1)), $arr);
+	// Test the per event post processing function
+	$arr=$this->component->onBehaviorEvent($this, $this->component, array($this, 'postEventFunction'));
+	$this->assertEquals(array(exp(4), exp(1)), $arr);
+	$arr=$this->component->onBehaviorEvent($this, $this->component, array($this, 'postEventFunction2'));
+	$this->assertEquals(array(sin(4), sin(1)), $arr);
 
 
-    //Testing Feed-forward functionality
-    unset($this->component->onBehaviorEvent);
+	//Testing Feed-forward functionality
+	unset($this->component->onBehaviorEvent);
 
-    $this->component->onBehaviorEvent = array($this, 'ffValue4');
-    $this->component->onBehaviorEvent = array($this, 'ffValue2');
-    $arr=$this->component->onBehaviorEvent($this, 5, TEventResults::EVENT_RESULT_FEED_FORWARD);
-    $this->assertEquals(array(20, 40), $arr);
+	$this->component->onBehaviorEvent = array($this, 'ffValue4');
+	$this->component->onBehaviorEvent = array($this, 'ffValue2');
+	$arr=$this->component->onBehaviorEvent($this, 5, TEventResults::EVENT_RESULT_FEED_FORWARD);
+	$this->assertEquals(array(20, 40), $arr);
 
 
-    unset($this->component->onBehaviorEvent);
+	unset($this->component->onBehaviorEvent);
 
-    //Order of these events affects the response order in feed forward
-    $this->component->onBehaviorEvent = array($this, 'ffValue2');
-    $this->component->onBehaviorEvent = array($this, 'ffValue4');
-    $arr=$this->component->onBehaviorEvent($this, 5, TEventResults::EVENT_RESULT_FEED_FORWARD);
-    $this->assertEquals(array(10, 40), $arr);
+	//Order of these events affects the response order in feed forward
+	$this->component->onBehaviorEvent = array($this, 'ffValue2');
+	$this->component->onBehaviorEvent = array($this, 'ffValue4');
+	$arr=$this->component->onBehaviorEvent($this, 5, TEventResults::EVENT_RESULT_FEED_FORWARD);
+	$this->assertEquals(array(10, 40), $arr);
   }
 
   public function returnValue1(){return 1;}
@@ -1796,31 +1796,31 @@ 
 
 
   public function testGlobalEventListenerInRaiseEvent() {
-    //TODO Test the Global Event Listener
+	//TODO Test the Global Event Listener
   }
 
 
   public function testIDynamicMethodsOnBehavior() {
 
 	//Add Behavior with dynamic call
-    $this->component->attachBehavior('TDynamicBehavior', new TDynamicBehavior);
+	$this->component->attachBehavior('TDynamicBehavior', new TDynamicBehavior);
 
-    //Check that the behavior is working as it should
-    $this->assertTrue($this->component->isa('TDynamicBehavior'));
-    $this->assertNull($this->component->getLastBehaviorDynamicMethodCalled());
+	//Check that the behavior is working as it should
+	$this->assertTrue($this->component->isa('TDynamicBehavior'));
+	$this->assertNull($this->component->getLastBehaviorDynamicMethodCalled());
 
-    // call basic behavior implemented method from object (containing behavior)
-    $this->assertEquals(42, $this->component->TestBehaviorMethod(6, 7));
+	// call basic behavior implemented method from object (containing behavior)
+	$this->assertEquals(42, $this->component->TestBehaviorMethod(6, 7));
 
-    //Test out undefined behavior/host object method
-    try {
-	    $this->component->objectAndBehaviorUndefinedMethod();
+	//Test out undefined behavior/host object method
+	try {
+		$this->component->objectAndBehaviorUndefinedMethod();
 		$this->fail('exception not raised when evaluating an undefined method by the object and behavior');
-    } catch(TApplicationException $e) {
-    }
+	} catch(TApplicationException $e) {
+	}
 
-    // calling undefined dynamic method, caught by the __dycall method in the behavior and implemented
-    //	this behavior catches undefined dynamic event and divides param1 by param 2
+	// calling undefined dynamic method, caught by the __dycall method in the behavior and implemented
+	//	this behavior catches undefined dynamic event and divides param1 by param 2
 	$this->assertEquals(22, $this->component->dyTestDynamicBehaviorMethod(242, 11));
 	$this->assertEquals('dyTestDynamicBehaviorMethod', $this->component->getLastBehaviorDynamicMethodCalled());
 
@@ -1832,30 +1832,30 @@ 
 	//	param1 * 2 * param2
 	$this->assertEquals(2420, $this->component->dyTestIntraEvent(121, 10));
 
-    $this->component->detachBehavior('TDynamicBehavior');
-    $this->assertFalse($this->component->isa('TDynamicBehavior'));
+	$this->component->detachBehavior('TDynamicBehavior');
+	$this->assertFalse($this->component->isa('TDynamicBehavior'));
 
 
 
 	//Add Class Behavior with dynamic call
-    $this->component->attachBehavior('TDynamicClassBehavior', new TDynamicClassBehavior);
+	$this->component->attachBehavior('TDynamicClassBehavior', new TDynamicClassBehavior);
 
-    //Check that the behavior is working as it should
-    $this->assertTrue($this->component->isa('TDynamicClassBehavior'));
-    $this->assertNull($this->component->getLastBehaviorDynamicMethodCalled());
+	//Check that the behavior is working as it should
+	$this->assertTrue($this->component->isa('TDynamicClassBehavior'));
+	$this->assertNull($this->component->getLastBehaviorDynamicMethodCalled());
 
-    // call basic behavior implemented method from object (containing behavior)
-    $this->assertEquals(42, $this->component->TestBehaviorMethod(6, 7));
+	// call basic behavior implemented method from object (containing behavior)
+	$this->assertEquals(42, $this->component->TestBehaviorMethod(6, 7));
 
-    //Test out undefined behavior/host object method
-    try {
-	    $this->component->objectAndBehaviorUndefinedMethod();
+	//Test out undefined behavior/host object method
+	try {
+		$this->component->objectAndBehaviorUndefinedMethod();
 		$this->fail('exception not raised when evaluating an undefined method by the object and behavior');
-    } catch(TApplicationException $e) {
-    }
+	} catch(TApplicationException $e) {
+	}
 
-    // calling undefined dynamic method, caught by the __dycall method in the behavior and implemented
-    //	this behavior catches undefined dynamic event and divides param1 by param 2
+	// calling undefined dynamic method, caught by the __dycall method in the behavior and implemented
+	//	this behavior catches undefined dynamic event and divides param1 by param 2
 	$this->assertEquals(22, $this->component->dyTestDynamicClassBehaviorMethod(242, 11));
 	$this->assertEquals('dyTestDynamicClassBehaviorMethod', $this->component->getLastBehaviorDynamicMethodCalled());
 
@@ -1867,8 +1867,8 @@ 
 	//	param1 * 2 * param2
 	$this->assertEquals(2420, $this->component->dyTestIntraEvent(121, 10));
 
-    $this->component->detachBehavior('TDynamicClassBehavior');
-    $this->assertFalse($this->component->isa('TDynamicClassBehavior'));
+	$this->component->detachBehavior('TDynamicClassBehavior');
+	$this->assertFalse($this->component->isa('TDynamicClassBehavior'));
 
 
   }
@@ -1899,80 +1899,80 @@ 
 
 
   public function testEvaluateExpression() {
-    $expression="1+2";
-    $this->assertTrue(3===$this->component->evaluateExpression($expression));
-    try {
-      $button=$this->component->evaluateExpression('$this->button');
-      $this->fail('exception not raised when evaluating an invalid exception');
-    } catch(Exception $e) {
-    }
+	$expression="1+2";
+	$this->assertTrue(3===$this->component->evaluateExpression($expression));
+	try {
+	  $button=$this->component->evaluateExpression('$this->button');
+	  $this->fail('exception not raised when evaluating an invalid exception');
+	} catch(Exception $e) {
+	}
   }
 
 
 
 
   public function testEvaluateStatements() {
-    $statements='$a="test string"; echo $a;';
-    $this->assertEquals('test string',$this->component->evaluateStatements($statements));
-    try {
-      $statements='$a=new NewComponent; echo $a->button;';
-      $button=$this->component->evaluateStatements($statements);
-      $this->fail('exception not raised when evaluating an invalid statement');
-    } catch(Exception $e) {
-    }
+	$statements='$a="test string"; echo $a;';
+	$this->assertEquals('test string',$this->component->evaluateStatements($statements));
+	try {
+	  $statements='$a=new NewComponent; echo $a->button;';
+	  $button=$this->component->evaluateStatements($statements);
+	  $this->fail('exception not raised when evaluating an invalid statement');
+	} catch(Exception $e) {
+	}
   }
 
 
   public function testDynamicFunctionCall() {
 
-    $this->assertEquals(' aa bb cc __ .. ++ || !! ?? ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
+	$this->assertEquals(' aa bb cc __ .. ++ || !! ?? ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
 
-    $this->component->attachBehavior('dy1', new dy1TextReplace);
-    $this->assertFalse($this->component->dy1->isCalled());
-    $this->assertEquals(' aa bb cc __ __ ++ || !! ?? ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
-    $this->assertTrue($this->component->dy1->isCalled());
+	$this->component->attachBehavior('dy1', new dy1TextReplace);
+	$this->assertFalse($this->component->dy1->isCalled());
+	$this->assertEquals(' aa bb cc __ __ ++ || !! ?? ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
+	$this->assertTrue($this->component->dy1->isCalled());
 
-    $this->component->attachBehavior('dy2', new dy2TextReplace);
-    $this->assertFalse($this->component->dy2->isCalled());
-    $this->assertEquals(' aa bb cc __ __ || || !! ?? ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
-    $this->assertTrue($this->component->dy2->isCalled());
+	$this->component->attachBehavior('dy2', new dy2TextReplace);
+	$this->assertFalse($this->component->dy2->isCalled());
+	$this->assertEquals(' aa bb cc __ __ || || !! ?? ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
+	$this->assertTrue($this->component->dy2->isCalled());
 
-    $this->component->attachBehavior('dy3', new dy3TextReplace);
-    $this->assertFalse($this->component->dy3->isCalled());
-    $this->assertEquals(' aa bb cc __ __ || || ?? ?? ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
-    $this->assertTrue($this->component->dy3->isCalled());
+	$this->component->attachBehavior('dy3', new dy3TextReplace);
+	$this->assertFalse($this->component->dy3->isCalled());
+	$this->assertEquals(' aa bb cc __ __ || || ?? ?? ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
+	$this->assertTrue($this->component->dy3->isCalled());
 
-    $this->assertEquals(' aa bb cc __ .. ++ || !! ?? ', $this->component->dyUndefinedEvent(' aa bb cc __ .. ++ || !! ?? '));
+	$this->assertEquals(' aa bb cc __ .. ++ || !! ?? ', $this->component->dyUndefinedEvent(' aa bb cc __ .. ++ || !! ?? '));
 
-    $this->assertEquals(0.25, $this->component->dyPowerFunction(2,2));
+	$this->assertEquals(0.25, $this->component->dyPowerFunction(2,2));
 
 
-    $this->component->detachBehavior('dy1');
-    $this->component->detachBehavior('dy2');
-    $this->component->detachBehavior('dy3');
+	$this->component->detachBehavior('dy1');
+	$this->component->detachBehavior('dy2');
+	$this->component->detachBehavior('dy3');
 
-    //test class behaviors of dynamic events and the argument list order
+	//test class behaviors of dynamic events and the argument list order
 
-    $this->assertEquals(' aa bb cc __ .. ++ || !! ?? ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
+	$this->assertEquals(' aa bb cc __ .. ++ || !! ?? ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
 
-    $this->component->attachBehavior('dy1', new dy1ClassTextReplace);
-    $this->assertFalse($this->component->dy1->isCalled());
-    $this->assertEquals(' aa bb cc .. .. ++ || !! ?? ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
-    $this->assertTrue($this->component->dy1->isCalled());
+	$this->component->attachBehavior('dy1', new dy1ClassTextReplace);
+	$this->assertFalse($this->component->dy1->isCalled());
+	$this->assertEquals(' aa bb cc .. .. ++ || !! ?? ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
+	$this->assertTrue($this->component->dy1->isCalled());
 
-    $this->component->attachBehavior('dy2', new dy2ClassTextReplace);
-    $this->assertFalse($this->component->dy2->isCalled());
-    $this->assertEquals(' aa bb cc .. .. ++ ++ !! ?? ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
-    $this->assertTrue($this->component->dy2->isCalled());
+	$this->component->attachBehavior('dy2', new dy2ClassTextReplace);
+	$this->assertFalse($this->component->dy2->isCalled());
+	$this->assertEquals(' aa bb cc .. .. ++ ++ !! ?? ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
+	$this->assertTrue($this->component->dy2->isCalled());
 
-    $this->component->attachBehavior('dy3', new dy3ClassTextReplace);
-    $this->assertFalse($this->component->dy3->isCalled());
-    $this->assertEquals(' aa bb cc .. .. ++ ++ !! ^_^ ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
-    $this->assertTrue($this->component->dy3->isCalled());
+	$this->component->attachBehavior('dy3', new dy3ClassTextReplace);
+	$this->assertFalse($this->component->dy3->isCalled());
+	$this->assertEquals(' aa bb cc .. .. ++ ++ !! ^_^ ', $this->component->dyTextFilter(' aa bb cc __ .. ++ || !! ?? '));
+	$this->assertTrue($this->component->dy3->isCalled());
 
-    $this->assertEquals(' aa bb cc __ .. ++ || !! ?? ', $this->component->dyUndefinedEvent(' aa bb cc __ .. ++ || !! ?? '));
+	$this->assertEquals(' aa bb cc __ .. ++ || !! ?? ', $this->component->dyUndefinedEvent(' aa bb cc __ .. ++ || !! ?? '));
 
-    $this->assertEquals(0.25, $this->component->dyPowerFunction(2,2));
+	$this->assertEquals(0.25, $this->component->dyPowerFunction(2,2));
 
 
   }
@@ -1982,61 +1982,61 @@ 
 
   public function testDynamicIntraObjectEvents() {
 
-    $this->component->attachBehavior('IntraEvents', new IntraObjectExtenderBehavior);
+	$this->component->attachBehavior('IntraEvents', new IntraObjectExtenderBehavior);
 
-    $this->assertNull($this->component->IntraEvents->LastCall);
+	$this->assertNull($this->component->IntraEvents->LastCall);
 
-    //unlisten first, this object listens upon instantiation.
-    $this->component->unlisten();
-    $this->assertEquals(2, $this->component->IntraEvents->LastCall);
+	//unlisten first, this object listens upon instantiation.
+	$this->component->unlisten();
+	$this->assertEquals(2, $this->component->IntraEvents->LastCall);
 
-    // ensures that IntraEvents nulls the last call variable when calling this getter
-    $this->assertNull($this->component->IntraEvents->LastCall);
+	// ensures that IntraEvents nulls the last call variable when calling this getter
+	$this->assertNull($this->component->IntraEvents->LastCall);
 
-    //listen next to undo the unlisten
-    $this->component->listen();
-    $this->assertEquals(1, $this->component->IntraEvents->LastCall);
+	//listen next to undo the unlisten
+	$this->component->listen();
+	$this->assertEquals(1, $this->component->IntraEvents->LastCall);
 
 
-    $this->assertEquals(3, $this->component->evaluateExpression('1+2'));
-    $this->assertEquals(7, $this->component->IntraEvents->LastCall);
+	$this->assertEquals(3, $this->component->evaluateExpression('1+2'));
+	$this->assertEquals(7, $this->component->IntraEvents->LastCall);
 
-    $statements='$a="test string"; echo $a;';
-    $this->assertEquals('test string', $this->component->evaluateStatements($statements));
-    $this->assertEquals(8, $this->component->IntraEvents->LastCall);
+	$statements='$a="test string"; echo $a;';
+	$this->assertEquals('test string', $this->component->evaluateStatements($statements));
+	$this->assertEquals(8, $this->component->IntraEvents->LastCall);
 
   	$component2 = new NewComponentNoListen();
-    $this->assertNull($this->component->createdOnTemplate($component2));
-    $this->assertEquals(9, $this->component->IntraEvents->LastCall);
+	$this->assertNull($this->component->createdOnTemplate($component2));
+	$this->assertEquals(9, $this->component->IntraEvents->LastCall);
 
-    $this->assertNull($this->component->addParsedObject($component2));
-    $this->assertEquals(10, $this->component->IntraEvents->LastCall);
+	$this->assertNull($this->component->addParsedObject($component2));
+	$this->assertEquals(10, $this->component->IntraEvents->LastCall);
 
 
 
-    $behavior = new BarBehavior;
-    $this->assertEquals($behavior, $this->component->attachBehavior('BarBehavior', $behavior));
-    $this->assertEquals(11, $this->component->IntraEvents->LastCall);
+	$behavior = new BarBehavior;
+	$this->assertEquals($behavior, $this->component->attachBehavior('BarBehavior', $behavior));
+	$this->assertEquals(11, $this->component->IntraEvents->LastCall);
 
-    $this->assertNull($this->component->disableBehaviors());
-    $this->assertNull($this->component->enableBehaviors());
-    $this->assertEquals(27, $this->component->IntraEvents->LastCall);
+	$this->assertNull($this->component->disableBehaviors());
+	$this->assertNull($this->component->enableBehaviors());
+	$this->assertEquals(27, $this->component->IntraEvents->LastCall);
 
-    $this->assertTrue($this->component->disableBehavior('BarBehavior'));
-    $this->assertEquals(16, $this->component->IntraEvents->LastCall);
+	$this->assertTrue($this->component->disableBehavior('BarBehavior'));
+	$this->assertEquals(16, $this->component->IntraEvents->LastCall);
 
-    $this->assertTrue($this->component->enableBehavior('BarBehavior'));
-    $this->assertEquals(15, $this->component->IntraEvents->LastCall);
+	$this->assertTrue($this->component->enableBehavior('BarBehavior'));
+	$this->assertEquals(15, $this->component->IntraEvents->LastCall);
 
-    $this->assertEquals($behavior, $this->component->detachBehavior('BarBehavior'));
-    $this->assertEquals(12, $this->component->IntraEvents->LastCall);
+	$this->assertEquals($behavior, $this->component->detachBehavior('BarBehavior'));
+	$this->assertEquals(12, $this->component->IntraEvents->LastCall);
 
 
-    $this->component->attachEventHandler('OnMyEvent',array($this->component,'myEventHandler'));
-    $this->component->raiseEvent('OnMyEvent',$this,null);
+	$this->component->attachEventHandler('OnMyEvent',array($this->component,'myEventHandler'));
+	$this->component->raiseEvent('OnMyEvent',$this,null);
 
-    //3 + 4 + 5 + 6 = 18 (the behavior adds these together when each raiseEvent dynamic intra event is called)
-    $this->assertEquals(18, $this->component->IntraEvents->LastCall);
+	//3 + 4 + 5 + 6 = 18 (the behavior adds these together when each raiseEvent dynamic intra event is called)
+	$this->assertEquals(18, $this->component->IntraEvents->LastCall);
   }
 
 
@@ -2047,23 +2047,23 @@ 
 	$this->assertFalse(isset($this->component->JsColorAttribute));
 
 	$this->component->ColorAttribute = "('#556677', '#abcdef', 503987)";
-    $this->assertEquals("('#556677', '#abcdef', 503987)", $this->component->ColorAttribute);
+	$this->assertEquals("('#556677', '#abcdef', 503987)", $this->component->ColorAttribute);
 
 	$this->assertTrue(isset($this->component->ColorAttribute));
 	$this->assertTrue(isset($this->component->JsColorAttribute));
 
 	$this->component->ColorAttribute = "new Array(1, 2, 3, 4, 5)";
-    $this->assertEquals("new Array(1, 2, 3, 4, 5)", $this->component->JsColorAttribute);
+	$this->assertEquals("new Array(1, 2, 3, 4, 5)", $this->component->JsColorAttribute);
 
 	$this->component->JsColorAttribute = "['#112233', '#fedcba', 22009837]";
-    $this->assertEquals("['#112233', '#fedcba', 22009837]", $this->component->ColorAttribute);
+	$this->assertEquals("['#112233', '#fedcba', 22009837]", $this->component->ColorAttribute);
   }
 
 
   public function testJavascriptIssetUnset() {
 
 	$this->component->JsColorAttribute = "['#112233', '#fedcba', 22009837]";
-    $this->assertEquals("['#112233', '#fedcba', 22009837]", $this->component->ColorAttribute);
+	$this->assertEquals("['#112233', '#fedcba', 22009837]", $this->component->ColorAttribute);
 
 	unset($this->component->ColorAttribute);