pradosoft / prado

tests/test_tools/simpletest/tag.php

Doc Comments +2 added lines, -3 removed lines

@@ -112,6 +112,7 @@ 
         /**
          *    Sets an attribute.
          *    @param string $label    Attribute name.
+         * @param string $value
          *    @return string $value   New attribute value.
          *    @access protected
          */
@@ -467,9 +468,6 @@ 
         /**
          *    Dispatches the value into the form encoded packet.
          *    @param SimpleEncoding $encoding    Form packet.
-         *    @param integer $x                  X coordinate of click.
-         *    @param integer $y                  Y coordinate of click.
-         *    @access public
          */
         function write($encoding){//, $x, $y) {
             if ($this->getName()) {
@@ -1274,6 +1272,7 @@ 
         /**
          *    Tests to see if a value is allowed.
          *    @param string    Attempted value.
+         * @param string $value
          *    @return boolean  True if a valid value.
          *    @access private
          */

Indentation +1345 added lines, -1345 removed lines

@@ -1,1391 +1,1391 @@
 <?php
-    /**
-     *	Base include file for SimpleTest.
-     *	@package	SimpleTest
-     *	@subpackage	WebTester
-     *	@version	$Id: tag.php 1398 2006-09-08 19:31:03Z xue $
-     */
-
-    /**#@+
+	/**
+	 *	Base include file for SimpleTest.
+	 *	@package	SimpleTest
+	 *	@subpackage	WebTester
+	 *	@version	$Id: tag.php 1398 2006-09-08 19:31:03Z xue $
+	 */
+
+	/**#@+
      * include SimpleTest files
      */
-    require_once(dirname(__FILE__) . '/parser.php');
-    require_once(dirname(__FILE__) . '/encoding.php');
-    /**#@-*/
+	require_once(dirname(__FILE__) . '/parser.php');
+	require_once(dirname(__FILE__) . '/encoding.php');
+	/**#@-*/
 
-    /**
-     *    HTML or XML tag.
+	/**
+	 *    HTML or XML tag.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleTag {
-        protected $_name;
-        protected $_attributes;
-        protected $_content;
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    @param string $name        Tag name.
-         *    @param hash $attributes    Attribute names and
-         *                               string values. Note that
-         *                               the keys must have been
-         *                               converted to lower case.
-         */
-        function SimpleTag($name, $attributes) {
-            $this->_name = strtolower(trim($name));
-            $this->_attributes = $attributes;
-            $this->_content = '';
-        }
-
-        /**
-         *    Check to see if the tag can have both start and
-         *    end tags with content in between.
-         *    @return boolean        True if content allowed.
-         *    @access public
-         */
-        function expectEndTag() {
-            return true;
-        }
-
-        /**
-         *    The current tag should not swallow all content for
-         *    itself as it's searchable page content. Private
-         *    content tags are usually widgets that contain default
-         *    values.
-         *    @return boolean        False as content is available
-         *                           to other tags by default.
-         *    @access public
-         */
-        function isPrivateContent() {
-            return false;
-        }
-
-        /**
-         *    Appends string content to the current content.
-         *    @param string $content        Additional text.
-         *    @access public
-         */
-        function addContent($content) {
-            $this->_content .= (string)$content;
-        }
-
-        /**
-         *    Adds an enclosed tag to the content.
-         *    @param SimpleTag $tag    New tag.
-         *    @access public
-         */
-        function addTag($tag) {
-        }
-
-        /**
-         *    Accessor for tag name.
-         *    @return string       Name of tag.
-         *    @access public
-         */
-        function getTagName() {
-            return $this->_name;
-        }
-
-        /**
-         *    List of legal child elements.
-         *    @return array        List of element names.
-         *    @access public
-         */
-        function getChildElements() {
-            return array();
-        }
-
-        /**
-         *    Accessor for an attribute.
-         *    @param string $label    Attribute name.
-         *    @return string          Attribute value.
-         *    @access public
-         */
-        function getAttribute($label) {
-            $label = strtolower($label);
-            if (! isset($this->_attributes[$label])) {
-                return false;
-            }
-            return (string)$this->_attributes[$label];
-        }
-
-        /**
-         *    Sets an attribute.
-         *    @param string $label    Attribute name.
-         *    @return string $value   New attribute value.
-         *    @access protected
-         */
-        function _setAttribute($label, $value) {
-            $this->_attributes[strtolower($label)] = $value;
-        }
-
-        /**
-         *    Accessor for the whole content so far.
-         *    @return string       Content as big raw string.
-         *    @access public
-         */
-        function getContent() {
-            return $this->_content;
-        }
-
-        /**
-         *    Accessor for content reduced to visible text. Acts
-         *    like a text mode browser, normalising space and
-         *    reducing images to their alt text.
-         *    @return string       Content as plain text.
-         *    @access public
-         */
-        function getText() {
-            return SimpleHtmlSaxParser::normalise($this->_content);
-        }
-
-        /**
-         *    Test to see if id attribute matches.
-         *    @param string $id        ID to test against.
-         *    @return boolean          True on match.
-         *    @access public
-         */
-        function isId($id) {
-            return ($this->getAttribute('id') == $id);
-        }
-    }
-
-    /**
-     *    Page title.
+	 */
+	class SimpleTag {
+		protected $_name;
+		protected $_attributes;
+		protected $_content;
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    @param string $name        Tag name.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values. Note that
+		 *                               the keys must have been
+		 *                               converted to lower case.
+		 */
+		function SimpleTag($name, $attributes) {
+			$this->_name = strtolower(trim($name));
+			$this->_attributes = $attributes;
+			$this->_content = '';
+		}
+
+		/**
+		 *    Check to see if the tag can have both start and
+		 *    end tags with content in between.
+		 *    @return boolean        True if content allowed.
+		 *    @access public
+		 */
+		function expectEndTag() {
+			return true;
+		}
+
+		/**
+		 *    The current tag should not swallow all content for
+		 *    itself as it's searchable page content. Private
+		 *    content tags are usually widgets that contain default
+		 *    values.
+		 *    @return boolean        False as content is available
+		 *                           to other tags by default.
+		 *    @access public
+		 */
+		function isPrivateContent() {
+			return false;
+		}
+
+		/**
+		 *    Appends string content to the current content.
+		 *    @param string $content        Additional text.
+		 *    @access public
+		 */
+		function addContent($content) {
+			$this->_content .= (string)$content;
+		}
+
+		/**
+		 *    Adds an enclosed tag to the content.
+		 *    @param SimpleTag $tag    New tag.
+		 *    @access public
+		 */
+		function addTag($tag) {
+		}
+
+		/**
+		 *    Accessor for tag name.
+		 *    @return string       Name of tag.
+		 *    @access public
+		 */
+		function getTagName() {
+			return $this->_name;
+		}
+
+		/**
+		 *    List of legal child elements.
+		 *    @return array        List of element names.
+		 *    @access public
+		 */
+		function getChildElements() {
+			return array();
+		}
+
+		/**
+		 *    Accessor for an attribute.
+		 *    @param string $label    Attribute name.
+		 *    @return string          Attribute value.
+		 *    @access public
+		 */
+		function getAttribute($label) {
+			$label = strtolower($label);
+			if (! isset($this->_attributes[$label])) {
+				return false;
+			}
+			return (string)$this->_attributes[$label];
+		}
+
+		/**
+		 *    Sets an attribute.
+		 *    @param string $label    Attribute name.
+		 *    @return string $value   New attribute value.
+		 *    @access protected
+		 */
+		function _setAttribute($label, $value) {
+			$this->_attributes[strtolower($label)] = $value;
+		}
+
+		/**
+		 *    Accessor for the whole content so far.
+		 *    @return string       Content as big raw string.
+		 *    @access public
+		 */
+		function getContent() {
+			return $this->_content;
+		}
+
+		/**
+		 *    Accessor for content reduced to visible text. Acts
+		 *    like a text mode browser, normalising space and
+		 *    reducing images to their alt text.
+		 *    @return string       Content as plain text.
+		 *    @access public
+		 */
+		function getText() {
+			return SimpleHtmlSaxParser::normalise($this->_content);
+		}
+
+		/**
+		 *    Test to see if id attribute matches.
+		 *    @param string $id        ID to test against.
+		 *    @return boolean          True on match.
+		 *    @access public
+		 */
+		function isId($id) {
+			return ($this->getAttribute('id') == $id);
+		}
+	}
+
+	/**
+	 *    Page title.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleTitleTag extends SimpleTag {
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleTitleTag($attributes) {
-            $this->SimpleTag('title', $attributes);
-        }
-    }
-
-    /**
-     *    Link.
+	 */
+	class SimpleTitleTag extends SimpleTag {
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleTitleTag($attributes) {
+			$this->SimpleTag('title', $attributes);
+		}
+	}
+
+	/**
+	 *    Link.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleAnchorTag extends SimpleTag {
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleAnchorTag($attributes) {
-            $this->SimpleTag('a', $attributes);
-        }
-
-        /**
-         *    Accessor for URL as string.
-         *    @return string    Coerced as string.
-         *    @access public
-         */
-        function getHref() {
-            $url = $this->getAttribute('href');
-            if (is_bool($url)) {
-                $url = '';
-            }
-            return $url;
-        }
-    }
-
-    /**
-     *    Form element.
+	 */
+	class SimpleAnchorTag extends SimpleTag {
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleAnchorTag($attributes) {
+			$this->SimpleTag('a', $attributes);
+		}
+
+		/**
+		 *    Accessor for URL as string.
+		 *    @return string    Coerced as string.
+		 *    @access public
+		 */
+		function getHref() {
+			$url = $this->getAttribute('href');
+			if (is_bool($url)) {
+				$url = '';
+			}
+			return $url;
+		}
+	}
+
+	/**
+	 *    Form element.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleWidget extends SimpleTag {
-        protected $_value;
-        protected $_label;
-        protected $_is_set;
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    @param string $name        Tag name.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleWidget($name, $attributes) {
-            $this->SimpleTag($name, $attributes);
-            $this->_value = false;
-            $this->_label = false;
-            $this->_is_set = false;
-        }
-
-        /**
-         *    Accessor for name submitted as the key in
-         *    GET/POST variables hash.
-         *    @return string        Parsed value.
-         *    @access public
-         */
-        function getName() {
-            return $this->getAttribute('name');
-        }
-
-        /**
-         *    Accessor for default value parsed with the tag.
-         *    @return string        Parsed value.
-         *    @access public
-         */
-        function getDefault() {
-            return $this->getAttribute('value');
-        }
-
-        /**
-         *    Accessor for currently set value or default if
-         *    none.
-         *    @return string      Value set by form or default
-         *                        if none.
-         *    @access public
-         */
-        function getValue() {
-            if (! $this->_is_set) {
-                return $this->getDefault();
-            }
-            return $this->_value;
-        }
-
-        /**
-         *    Sets the current form element value.
-         *    @param string $value       New value.
-         *    @return boolean            True if allowed.
-         *    @access public
-         */
-        function setValue($value) {
-            $this->_value = $value;
-            $this->_is_set = true;
-            return true;
-        }
-
-        /**
-         *    Resets the form element value back to the
-         *    default.
-         *    @access public
-         */
-        function resetValue() {
-            $this->_is_set = false;
-        }
-
-        /**
-         *    Allows setting of a label externally, say by a
-         *    label tag.
-         *    @param string $label    Label to attach.
-         *    @access public
-         */
-        function setLabel($label) {
-            $this->_label = trim($label);
-        }
-
-        /**
-         *    Reads external or internal label.
-         *    @param string $label    Label to test.
-         *    @return boolean         True is match.
-         *    @access public
-         */
-        function isLabel($label) {
-            return $this->_label == trim($label);
-        }
-
-        /**
-         *    Dispatches the value into the form encoded packet.
-         *    @param SimpleEncoding $encoding    Form packet.
-         *    @access public
-         */
-        function write($encoding) {
-            if ($this->getName()) {
-                $encoding->add($this->getName(), $this->getValue());
-            }
-        }
-    }
-
-    /**
-     *    Text, password and hidden field.
+	 */
+	class SimpleWidget extends SimpleTag {
+		protected $_value;
+		protected $_label;
+		protected $_is_set;
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    @param string $name        Tag name.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleWidget($name, $attributes) {
+			$this->SimpleTag($name, $attributes);
+			$this->_value = false;
+			$this->_label = false;
+			$this->_is_set = false;
+		}
+
+		/**
+		 *    Accessor for name submitted as the key in
+		 *    GET/POST variables hash.
+		 *    @return string        Parsed value.
+		 *    @access public
+		 */
+		function getName() {
+			return $this->getAttribute('name');
+		}
+
+		/**
+		 *    Accessor for default value parsed with the tag.
+		 *    @return string        Parsed value.
+		 *    @access public
+		 */
+		function getDefault() {
+			return $this->getAttribute('value');
+		}
+
+		/**
+		 *    Accessor for currently set value or default if
+		 *    none.
+		 *    @return string      Value set by form or default
+		 *                        if none.
+		 *    @access public
+		 */
+		function getValue() {
+			if (! $this->_is_set) {
+				return $this->getDefault();
+			}
+			return $this->_value;
+		}
+
+		/**
+		 *    Sets the current form element value.
+		 *    @param string $value       New value.
+		 *    @return boolean            True if allowed.
+		 *    @access public
+		 */
+		function setValue($value) {
+			$this->_value = $value;
+			$this->_is_set = true;
+			return true;
+		}
+
+		/**
+		 *    Resets the form element value back to the
+		 *    default.
+		 *    @access public
+		 */
+		function resetValue() {
+			$this->_is_set = false;
+		}
+
+		/**
+		 *    Allows setting of a label externally, say by a
+		 *    label tag.
+		 *    @param string $label    Label to attach.
+		 *    @access public
+		 */
+		function setLabel($label) {
+			$this->_label = trim($label);
+		}
+
+		/**
+		 *    Reads external or internal label.
+		 *    @param string $label    Label to test.
+		 *    @return boolean         True is match.
+		 *    @access public
+		 */
+		function isLabel($label) {
+			return $this->_label == trim($label);
+		}
+
+		/**
+		 *    Dispatches the value into the form encoded packet.
+		 *    @param SimpleEncoding $encoding    Form packet.
+		 *    @access public
+		 */
+		function write($encoding) {
+			if ($this->getName()) {
+				$encoding->add($this->getName(), $this->getValue());
+			}
+		}
+	}
+
+	/**
+	 *    Text, password and hidden field.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleTextTag extends SimpleWidget {
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleTextTag($attributes) {
-            $this->SimpleWidget('input', $attributes);
-            if ($this->getAttribute('value') === false) {
-                $this->_setAttribute('value', '');
-            }
-        }
-
-        /**
-         *    Tag contains no content.
-         *    @return boolean        False.
-         *    @access public
-         */
-        function expectEndTag() {
-            return false;
-        }
-
-        /**
-         *    Sets the current form element value. Cannot
-         *    change the value of a hidden field.
-         *    @param string $value       New value.
-         *    @return boolean            True if allowed.
-         *    @access public
-         */
-        function setValue($value) {
-            if ($this->getAttribute('type') == 'hidden') {
-                return false;
-            }
-            return parent::setValue($value);
-        }
-    }
-
-    /**
-     *    Submit button as input tag.
+	 */
+	class SimpleTextTag extends SimpleWidget {
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleTextTag($attributes) {
+			$this->SimpleWidget('input', $attributes);
+			if ($this->getAttribute('value') === false) {
+				$this->_setAttribute('value', '');
+			}
+		}
+
+		/**
+		 *    Tag contains no content.
+		 *    @return boolean        False.
+		 *    @access public
+		 */
+		function expectEndTag() {
+			return false;
+		}
+
+		/**
+		 *    Sets the current form element value. Cannot
+		 *    change the value of a hidden field.
+		 *    @param string $value       New value.
+		 *    @return boolean            True if allowed.
+		 *    @access public
+		 */
+		function setValue($value) {
+			if ($this->getAttribute('type') == 'hidden') {
+				return false;
+			}
+			return parent::setValue($value);
+		}
+	}
+
+	/**
+	 *    Submit button as input tag.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleSubmitTag extends SimpleWidget {
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleSubmitTag($attributes) {
-            $this->SimpleWidget('input', $attributes);
-            if ($this->getAttribute('value') === false) {
-                $this->_setAttribute('value', 'Submit');
-            }
-        }
-
-        /**
-         *    Tag contains no end element.
-         *    @return boolean        False.
-         *    @access public
-         */
-        function expectEndTag() {
-            return false;
-        }
-
-        /**
-         *    Disables the setting of the button value.
-         *    @param string $value       Ignored.
-         *    @return boolean            True if allowed.
-         *    @access public
-         */
-        function setValue($value) {
-            return false;
-        }
-
-        /**
-         *    Value of browser visible text.
-         *    @return string        Visible label.
-         *    @access public
-         */
-        function getLabel() {
-            return $this->getValue();
-        }
-
-        /**
-         *    Test for a label match when searching.
-         *    @param string $label     Label to test.
-         *    @return boolean          True on match.
-         *    @access public
-         */
-        function isLabel($label) {
-            return trim($label) == trim($this->getLabel());
-        }
-    }
-
-    /**
-     *    Image button as input tag.
+	 */
+	class SimpleSubmitTag extends SimpleWidget {
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleSubmitTag($attributes) {
+			$this->SimpleWidget('input', $attributes);
+			if ($this->getAttribute('value') === false) {
+				$this->_setAttribute('value', 'Submit');
+			}
+		}
+
+		/**
+		 *    Tag contains no end element.
+		 *    @return boolean        False.
+		 *    @access public
+		 */
+		function expectEndTag() {
+			return false;
+		}
+
+		/**
+		 *    Disables the setting of the button value.
+		 *    @param string $value       Ignored.
+		 *    @return boolean            True if allowed.
+		 *    @access public
+		 */
+		function setValue($value) {
+			return false;
+		}
+
+		/**
+		 *    Value of browser visible text.
+		 *    @return string        Visible label.
+		 *    @access public
+		 */
+		function getLabel() {
+			return $this->getValue();
+		}
+
+		/**
+		 *    Test for a label match when searching.
+		 *    @param string $label     Label to test.
+		 *    @return boolean          True on match.
+		 *    @access public
+		 */
+		function isLabel($label) {
+			return trim($label) == trim($this->getLabel());
+		}
+	}
+
+	/**
+	 *    Image button as input tag.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleImageSubmitTag extends SimpleWidget {
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleImageSubmitTag($attributes) {
-            $this->SimpleWidget('input', $attributes);
-        }
-
-        /**
-         *    Tag contains no end element.
-         *    @return boolean        False.
-         *    @access public
-         */
-        function expectEndTag() {
-            return false;
-        }
-
-        /**
-         *    Disables the setting of the button value.
-         *    @param string $value       Ignored.
-         *    @return boolean            True if allowed.
-         *    @access public
-         */
-        function setValue($value) {
-            return false;
-        }
-
-        /**
-         *    Value of browser visible text.
-         *    @return string        Visible label.
-         *    @access public
-         */
-        function getLabel() {
-            if ($this->getAttribute('title')) {
-                return $this->getAttribute('title');
-            }
-            return $this->getAttribute('alt');
-        }
-
-        /**
-         *    Test for a label match when searching.
-         *    @param string $label     Label to test.
-         *    @return boolean          True on match.
-         *    @access public
-         */
-        function isLabel($label) {
-            return trim($label) == trim($this->getLabel());
-        }
-
-        /**
-         *    Dispatches the value into the form encoded packet.
-         *    @param SimpleEncoding $encoding    Form packet.
-         *    @param integer $x                  X coordinate of click.
-         *    @param integer $y                  Y coordinate of click.
-         *    @access public
-         */
-        function write($encoding){//, $x, $y) {
-            if ($this->getName()) {
-                $encoding->add($this->getName() . '.x', $x);
-                $encoding->add($this->getName() . '.y', $y);
-            } else {
-                $encoding->add('x', $x);
-                $encoding->add('y', $y);
-            }
-        }
-    }
-
-    /**
-     *    Submit button as button tag.
+	 */
+	class SimpleImageSubmitTag extends SimpleWidget {
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleImageSubmitTag($attributes) {
+			$this->SimpleWidget('input', $attributes);
+		}
+
+		/**
+		 *    Tag contains no end element.
+		 *    @return boolean        False.
+		 *    @access public
+		 */
+		function expectEndTag() {
+			return false;
+		}
+
+		/**
+		 *    Disables the setting of the button value.
+		 *    @param string $value       Ignored.
+		 *    @return boolean            True if allowed.
+		 *    @access public
+		 */
+		function setValue($value) {
+			return false;
+		}
+
+		/**
+		 *    Value of browser visible text.
+		 *    @return string        Visible label.
+		 *    @access public
+		 */
+		function getLabel() {
+			if ($this->getAttribute('title')) {
+				return $this->getAttribute('title');
+			}
+			return $this->getAttribute('alt');
+		}
+
+		/**
+		 *    Test for a label match when searching.
+		 *    @param string $label     Label to test.
+		 *    @return boolean          True on match.
+		 *    @access public
+		 */
+		function isLabel($label) {
+			return trim($label) == trim($this->getLabel());
+		}
+
+		/**
+		 *    Dispatches the value into the form encoded packet.
+		 *    @param SimpleEncoding $encoding    Form packet.
+		 *    @param integer $x                  X coordinate of click.
+		 *    @param integer $y                  Y coordinate of click.
+		 *    @access public
+		 */
+		function write($encoding){//, $x, $y) {
+			if ($this->getName()) {
+				$encoding->add($this->getName() . '.x', $x);
+				$encoding->add($this->getName() . '.y', $y);
+			} else {
+				$encoding->add('x', $x);
+				$encoding->add('y', $y);
+			}
+		}
+	}
+
+	/**
+	 *    Submit button as button tag.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleButtonTag extends SimpleWidget {
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    Defaults are very browser dependent.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleButtonTag($attributes) {
-            $this->SimpleWidget('button', $attributes);
-        }
-
-        /**
-         *    Check to see if the tag can have both start and
-         *    end tags with content in between.
-         *    @return boolean        True if content allowed.
-         *    @access public
-         */
-        function expectEndTag() {
-            return true;
-        }
-
-        /**
-         *    Disables the setting of the button value.
-         *    @param string $value       Ignored.
-         *    @return boolean            True if allowed.
-         *    @access public
-         */
-        function setValue($value) {
-            return false;
-        }
-
-        /**
-         *    Value of browser visible text.
-         *    @return string        Visible label.
-         *    @access public
-         */
-        function getLabel() {
-            return $this->getContent();
-        }
-
-        /**
-         *    Test for a label match when searching.
-         *    @param string $label     Label to test.
-         *    @return boolean          True on match.
-         *    @access public
-         */
-        function isLabel($label) {
-            return trim($label) == trim($this->getLabel());
-        }
-    }
-
-    /**
-     *    Content tag for text area.
+	 */
+	class SimpleButtonTag extends SimpleWidget {
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    Defaults are very browser dependent.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleButtonTag($attributes) {
+			$this->SimpleWidget('button', $attributes);
+		}
+
+		/**
+		 *    Check to see if the tag can have both start and
+		 *    end tags with content in between.
+		 *    @return boolean        True if content allowed.
+		 *    @access public
+		 */
+		function expectEndTag() {
+			return true;
+		}
+
+		/**
+		 *    Disables the setting of the button value.
+		 *    @param string $value       Ignored.
+		 *    @return boolean            True if allowed.
+		 *    @access public
+		 */
+		function setValue($value) {
+			return false;
+		}
+
+		/**
+		 *    Value of browser visible text.
+		 *    @return string        Visible label.
+		 *    @access public
+		 */
+		function getLabel() {
+			return $this->getContent();
+		}
+
+		/**
+		 *    Test for a label match when searching.
+		 *    @param string $label     Label to test.
+		 *    @return boolean          True on match.
+		 *    @access public
+		 */
+		function isLabel($label) {
+			return trim($label) == trim($this->getLabel());
+		}
+	}
+
+	/**
+	 *    Content tag for text area.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleTextAreaTag extends SimpleWidget {
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleTextAreaTag($attributes) {
-            $this->SimpleWidget('textarea', $attributes);
-        }
-
-        /**
-         *    Accessor for starting value.
-         *    @return string        Parsed value.
-         *    @access public
-         */
-        function getDefault() {
-            return $this->_wrap(SimpleHtmlSaxParser::decodeHtml($this->getContent()));
-        }
-
-        /**
-         *    Applies word wrapping if needed.
-         *    @param string $value      New value.
-         *    @return boolean            True if allowed.
-         *    @access public
-         */
-        function setValue($value) {
-            return parent::setValue($this->_wrap($value));
-        }
-
-        /**
-         *    Test to see if text should be wrapped.
-         *    @return boolean        True if wrapping on.
-         *    @access private
-         */
-        function _wrapIsEnabled() {
-            if ($this->getAttribute('cols')) {
-                $wrap = $this->getAttribute('wrap');
-                if (($wrap == 'physical') || ($wrap == 'hard')) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         *    Performs the formatting that is peculiar to
-         *    this tag. There is strange behaviour in this
-         *    one, including stripping a leading new line.
-         *    Go figure. I am using Firefox as a guide.
-         *    @param string $text    Text to wrap.
-         *    @return string         Text wrapped with carriage
-         *                           returns and line feeds
-         *    @access private
-         */
-        function _wrap($text) {
-            $text = str_replace("\r\r\n", "\r\n", str_replace("\n", "\r\n", $text));
-            $text = str_replace("\r\n\n", "\r\n", str_replace("\r", "\r\n", $text));
-            if (strncmp($text, "\r\n", strlen("\r\n")) == 0) {
-                $text = substr($text, strlen("\r\n"));
-            }
-            if ($this->_wrapIsEnabled()) {
-                return wordwrap(
-                        $text,
-                        (integer)$this->getAttribute('cols'),
-                        "\r\n");
-            }
-            return $text;
-        }
-
-        /**
-         *    The content of textarea is not part of the page.
-         *    @return boolean        True.
-         *    @access public
-         */
-        function isPrivateContent() {
-            return true;
-        }
-    }
-
-    /**
-     *    File upload widget.
+	 */
+	class SimpleTextAreaTag extends SimpleWidget {
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleTextAreaTag($attributes) {
+			$this->SimpleWidget('textarea', $attributes);
+		}
+
+		/**
+		 *    Accessor for starting value.
+		 *    @return string        Parsed value.
+		 *    @access public
+		 */
+		function getDefault() {
+			return $this->_wrap(SimpleHtmlSaxParser::decodeHtml($this->getContent()));
+		}
+
+		/**
+		 *    Applies word wrapping if needed.
+		 *    @param string $value      New value.
+		 *    @return boolean            True if allowed.
+		 *    @access public
+		 */
+		function setValue($value) {
+			return parent::setValue($this->_wrap($value));
+		}
+
+		/**
+		 *    Test to see if text should be wrapped.
+		 *    @return boolean        True if wrapping on.
+		 *    @access private
+		 */
+		function _wrapIsEnabled() {
+			if ($this->getAttribute('cols')) {
+				$wrap = $this->getAttribute('wrap');
+				if (($wrap == 'physical') || ($wrap == 'hard')) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 *    Performs the formatting that is peculiar to
+		 *    this tag. There is strange behaviour in this
+		 *    one, including stripping a leading new line.
+		 *    Go figure. I am using Firefox as a guide.
+		 *    @param string $text    Text to wrap.
+		 *    @return string         Text wrapped with carriage
+		 *                           returns and line feeds
+		 *    @access private
+		 */
+		function _wrap($text) {
+			$text = str_replace("\r\r\n", "\r\n", str_replace("\n", "\r\n", $text));
+			$text = str_replace("\r\n\n", "\r\n", str_replace("\r", "\r\n", $text));
+			if (strncmp($text, "\r\n", strlen("\r\n")) == 0) {
+				$text = substr($text, strlen("\r\n"));
+			}
+			if ($this->_wrapIsEnabled()) {
+				return wordwrap(
+						$text,
+						(integer)$this->getAttribute('cols'),
+						"\r\n");
+			}
+			return $text;
+		}
+
+		/**
+		 *    The content of textarea is not part of the page.
+		 *    @return boolean        True.
+		 *    @access public
+		 */
+		function isPrivateContent() {
+			return true;
+		}
+	}
+
+	/**
+	 *    File upload widget.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleUploadTag extends SimpleWidget {
-
-        /**
-         *    Starts with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleUploadTag($attributes) {
-            $this->SimpleWidget('input', $attributes);
-        }
-
-        /**
-         *    Tag contains no content.
-         *    @return boolean        False.
-         *    @access public
-         */
-        function expectEndTag() {
-            return false;
-        }
-
-        /**
-         *    Dispatches the value into the form encoded packet.
-         *    @param SimpleEncoding $encoding    Form packet.
-         *    @access public
-         */
-        function write($encoding) {
-            if (! file_exists($this->getValue())) {
-                return;
-            }
-            $encoding->attach(
-                    $this->getName(),
-                    implode('', file($this->getValue())),
-                    basename($this->getValue()));
-        }
-    }
-
-    /**
-     *    Drop down widget.
+	 */
+	class SimpleUploadTag extends SimpleWidget {
+
+		/**
+		 *    Starts with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleUploadTag($attributes) {
+			$this->SimpleWidget('input', $attributes);
+		}
+
+		/**
+		 *    Tag contains no content.
+		 *    @return boolean        False.
+		 *    @access public
+		 */
+		function expectEndTag() {
+			return false;
+		}
+
+		/**
+		 *    Dispatches the value into the form encoded packet.
+		 *    @param SimpleEncoding $encoding    Form packet.
+		 *    @access public
+		 */
+		function write($encoding) {
+			if (! file_exists($this->getValue())) {
+				return;
+			}
+			$encoding->attach(
+					$this->getName(),
+					implode('', file($this->getValue())),
+					basename($this->getValue()));
+		}
+	}
+
+	/**
+	 *    Drop down widget.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleSelectionTag extends SimpleWidget {
-        protected $_options;
-        protected $_choice;
-
-        /**
-         *    Starts with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleSelectionTag($attributes) {
-            $this->SimpleWidget('select', $attributes);
-            $this->_options = array();
-            $this->_choice = false;
-        }
-
-        /**
-         *    Adds an option tag to a selection field.
-         *    @param SimpleOptionTag $tag     New option.
-         *    @access public
-         */
-        function addTag($tag) {
-            if ($tag->getTagName() == 'option') {
-                $this->_options[] = $tag;
-            }
-        }
-
-        /**
-         *    Text within the selection element is ignored.
-         *    @param string $content        Ignored.
-         *    @access public
-         */
-        function addContent($content) {
-        }
-
-        /**
-         *    Scans options for defaults. If none, then
-         *    the first option is selected.
-         *    @return string        Selected field.
-         *    @access public
-         */
-        function getDefault() {
-            for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
-                if ($this->_options[$i]->getAttribute('selected') !== false) {
-                    return $this->_options[$i]->getDefault();
-                }
-            }
-            if ($count > 0) {
-                return $this->_options[0]->getDefault();
-            }
-            return '';
-        }
-
-        /**
-         *    Can only set allowed values.
-         *    @param string $value       New choice.
-         *    @return boolean            True if allowed.
-         *    @access public
-         */
-        function setValue($value) {
-            for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
-                if ($this->_options[$i]->isValue($value)) {
-                    $this->_choice = $i;
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         *    Accessor for current selection value.
-         *    @return string      Value attribute or
-         *                        content of opton.
-         *    @access public
-         */
-        function getValue() {
-            if ($this->_choice === false) {
-                return $this->getDefault();
-            }
-            return $this->_options[$this->_choice]->getValue();
-        }
-    }
-
-    /**
-     *    Drop down widget.
+	 */
+	class SimpleSelectionTag extends SimpleWidget {
+		protected $_options;
+		protected $_choice;
+
+		/**
+		 *    Starts with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleSelectionTag($attributes) {
+			$this->SimpleWidget('select', $attributes);
+			$this->_options = array();
+			$this->_choice = false;
+		}
+
+		/**
+		 *    Adds an option tag to a selection field.
+		 *    @param SimpleOptionTag $tag     New option.
+		 *    @access public
+		 */
+		function addTag($tag) {
+			if ($tag->getTagName() == 'option') {
+				$this->_options[] = $tag;
+			}
+		}
+
+		/**
+		 *    Text within the selection element is ignored.
+		 *    @param string $content        Ignored.
+		 *    @access public
+		 */
+		function addContent($content) {
+		}
+
+		/**
+		 *    Scans options for defaults. If none, then
+		 *    the first option is selected.
+		 *    @return string        Selected field.
+		 *    @access public
+		 */
+		function getDefault() {
+			for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
+				if ($this->_options[$i]->getAttribute('selected') !== false) {
+					return $this->_options[$i]->getDefault();
+				}
+			}
+			if ($count > 0) {
+				return $this->_options[0]->getDefault();
+			}
+			return '';
+		}
+
+		/**
+		 *    Can only set allowed values.
+		 *    @param string $value       New choice.
+		 *    @return boolean            True if allowed.
+		 *    @access public
+		 */
+		function setValue($value) {
+			for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
+				if ($this->_options[$i]->isValue($value)) {
+					$this->_choice = $i;
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 *    Accessor for current selection value.
+		 *    @return string      Value attribute or
+		 *                        content of opton.
+		 *    @access public
+		 */
+		function getValue() {
+			if ($this->_choice === false) {
+				return $this->getDefault();
+			}
+			return $this->_options[$this->_choice]->getValue();
+		}
+	}
+
+	/**
+	 *    Drop down widget.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class MultipleSelectionTag extends SimpleWidget {
-        protected $_options;
-        protected $_values;
-
-        /**
-         *    Starts with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function MultipleSelectionTag($attributes) {
-            $this->SimpleWidget('select', $attributes);
-            $this->_options = array();
-            $this->_values = false;
-        }
-
-        /**
-         *    Adds an option tag to a selection field.
-         *    @param SimpleOptionTag $tag     New option.
-         *    @access public
-         */
-        function addTag($tag) {
-            if ($tag->getTagName() == 'option') {
-                $this->_options[] = $tag;
-            }
-        }
-
-        /**
-         *    Text within the selection element is ignored.
-         *    @param string $content        Ignored.
-         *    @access public
-         */
-        function addContent($content) {
-        }
-
-        /**
-         *    Scans options for defaults to populate the
-         *    value array().
-         *    @return array        Selected fields.
-         *    @access public
-         */
-        function getDefault() {
-            $default = array();
-            for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
-                if ($this->_options[$i]->getAttribute('selected') !== false) {
-                    $default[] = $this->_options[$i]->getDefault();
-                }
-            }
-            return $default;
-        }
-
-        /**
-         *    Can only set allowed values. Any illegal value
-         *    will result in a failure, but all correct values
-         *    will be set.
-         *    @param array $desired      New choices.
-         *    @return boolean            True if all allowed.
-         *    @access public
-         */
-        function setValue($desired) {
-            $achieved = array();
-            foreach ($desired as $value) {
-                $success = false;
-                for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
-                    if ($this->_options[$i]->isValue($value)) {
-                        $achieved[] = $this->_options[$i]->getValue();
-                        $success = true;
-                        break;
-                    }
-                }
-                if (! $success) {
-                    return false;
-                }
-            }
-            $this->_values = $achieved;
-            return true;
-        }
-
-        /**
-         *    Accessor for current selection value.
-         *    @return array      List of currently set options.
-         *    @access public
-         */
-        function getValue() {
-            if ($this->_values === false) {
-                return $this->getDefault();
-            }
-            return $this->_values;
-        }
-    }
-
-    /**
-     *    Option for selection field.
+	 */
+	class MultipleSelectionTag extends SimpleWidget {
+		protected $_options;
+		protected $_values;
+
+		/**
+		 *    Starts with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function MultipleSelectionTag($attributes) {
+			$this->SimpleWidget('select', $attributes);
+			$this->_options = array();
+			$this->_values = false;
+		}
+
+		/**
+		 *    Adds an option tag to a selection field.
+		 *    @param SimpleOptionTag $tag     New option.
+		 *    @access public
+		 */
+		function addTag($tag) {
+			if ($tag->getTagName() == 'option') {
+				$this->_options[] = $tag;
+			}
+		}
+
+		/**
+		 *    Text within the selection element is ignored.
+		 *    @param string $content        Ignored.
+		 *    @access public
+		 */
+		function addContent($content) {
+		}
+
+		/**
+		 *    Scans options for defaults to populate the
+		 *    value array().
+		 *    @return array        Selected fields.
+		 *    @access public
+		 */
+		function getDefault() {
+			$default = array();
+			for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
+				if ($this->_options[$i]->getAttribute('selected') !== false) {
+					$default[] = $this->_options[$i]->getDefault();
+				}
+			}
+			return $default;
+		}
+
+		/**
+		 *    Can only set allowed values. Any illegal value
+		 *    will result in a failure, but all correct values
+		 *    will be set.
+		 *    @param array $desired      New choices.
+		 *    @return boolean            True if all allowed.
+		 *    @access public
+		 */
+		function setValue($desired) {
+			$achieved = array();
+			foreach ($desired as $value) {
+				$success = false;
+				for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
+					if ($this->_options[$i]->isValue($value)) {
+						$achieved[] = $this->_options[$i]->getValue();
+						$success = true;
+						break;
+					}
+				}
+				if (! $success) {
+					return false;
+				}
+			}
+			$this->_values = $achieved;
+			return true;
+		}
+
+		/**
+		 *    Accessor for current selection value.
+		 *    @return array      List of currently set options.
+		 *    @access public
+		 */
+		function getValue() {
+			if ($this->_values === false) {
+				return $this->getDefault();
+			}
+			return $this->_values;
+		}
+	}
+
+	/**
+	 *    Option for selection field.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleOptionTag extends SimpleWidget {
-
-        /**
-         *    Stashes the attributes.
-         */
-        function SimpleOptionTag($attributes) {
-            $this->SimpleWidget('option', $attributes);
-        }
-
-        /**
-         *    Does nothing.
-         *    @param string $value      Ignored.
-         *    @return boolean           Not allowed.
-         *    @access public
-         */
-        function setValue($value) {
-            return false;
-        }
-
-        /**
-         *    Test to see if a value matches the option.
-         *    @param string $compare    Value to compare with.
-         *    @return boolean           True if possible match.
-         *    @access public
-         */
-        function isValue($compare) {
-            $compare = trim($compare);
-            if (trim($this->getValue()) == $compare) {
-                return true;
-            }
-            return trim($this->getContent()) == $compare;
-        }
-
-        /**
-         *    Accessor for starting value. Will be set to
-         *    the option label if no value exists.
-         *    @return string        Parsed value.
-         *    @access public
-         */
-        function getDefault() {
-            if ($this->getAttribute('value') === false) {
-                return $this->getContent();
-            }
-            return $this->getAttribute('value');
-        }
-
-        /**
-         *    The content of options is not part of the page.
-         *    @return boolean        True.
-         *    @access public
-         */
-        function isPrivateContent() {
-            return true;
-        }
-    }
-
-    /**
-     *    Radio button.
+	 */
+	class SimpleOptionTag extends SimpleWidget {
+
+		/**
+		 *    Stashes the attributes.
+		 */
+		function SimpleOptionTag($attributes) {
+			$this->SimpleWidget('option', $attributes);
+		}
+
+		/**
+		 *    Does nothing.
+		 *    @param string $value      Ignored.
+		 *    @return boolean           Not allowed.
+		 *    @access public
+		 */
+		function setValue($value) {
+			return false;
+		}
+
+		/**
+		 *    Test to see if a value matches the option.
+		 *    @param string $compare    Value to compare with.
+		 *    @return boolean           True if possible match.
+		 *    @access public
+		 */
+		function isValue($compare) {
+			$compare = trim($compare);
+			if (trim($this->getValue()) == $compare) {
+				return true;
+			}
+			return trim($this->getContent()) == $compare;
+		}
+
+		/**
+		 *    Accessor for starting value. Will be set to
+		 *    the option label if no value exists.
+		 *    @return string        Parsed value.
+		 *    @access public
+		 */
+		function getDefault() {
+			if ($this->getAttribute('value') === false) {
+				return $this->getContent();
+			}
+			return $this->getAttribute('value');
+		}
+
+		/**
+		 *    The content of options is not part of the page.
+		 *    @return boolean        True.
+		 *    @access public
+		 */
+		function isPrivateContent() {
+			return true;
+		}
+	}
+
+	/**
+	 *    Radio button.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleRadioButtonTag extends SimpleWidget {
-
-        /**
-         *    Stashes the attributes.
-         *    @param array $attributes        Hash of attributes.
-         */
-        function SimpleRadioButtonTag($attributes) {
-            $this->SimpleWidget('input', $attributes);
-            if ($this->getAttribute('value') === false) {
-                $this->_setAttribute('value', 'on');
-            }
-        }
-
-        /**
-         *    Tag contains no content.
-         *    @return boolean        False.
-         *    @access public
-         */
-        function expectEndTag() {
-            return false;
-        }
-
-        /**
-         *    The only allowed value sn the one in the
-         *    "value" attribute.
-         *    @param string $value      New value.
-         *    @return boolean           True if allowed.
-         *    @access public
-         */
-        function setValue($value) {
-            if ($value === false) {
-                return parent::setValue($value);
-            }
-            if ($value !== $this->getAttribute('value')) {
-                return false;
-            }
-            return parent::setValue($value);
-        }
-
-        /**
-         *    Accessor for starting value.
-         *    @return string        Parsed value.
-         *    @access public
-         */
-        function getDefault() {
-            if ($this->getAttribute('checked') !== false) {
-                return $this->getAttribute('value');
-            }
-            return false;
-        }
-    }
-
-    /**
-     *    Checkbox widget.
+	 */
+	class SimpleRadioButtonTag extends SimpleWidget {
+
+		/**
+		 *    Stashes the attributes.
+		 *    @param array $attributes        Hash of attributes.
+		 */
+		function SimpleRadioButtonTag($attributes) {
+			$this->SimpleWidget('input', $attributes);
+			if ($this->getAttribute('value') === false) {
+				$this->_setAttribute('value', 'on');
+			}
+		}
+
+		/**
+		 *    Tag contains no content.
+		 *    @return boolean        False.
+		 *    @access public
+		 */
+		function expectEndTag() {
+			return false;
+		}
+
+		/**
+		 *    The only allowed value sn the one in the
+		 *    "value" attribute.
+		 *    @param string $value      New value.
+		 *    @return boolean           True if allowed.
+		 *    @access public
+		 */
+		function setValue($value) {
+			if ($value === false) {
+				return parent::setValue($value);
+			}
+			if ($value !== $this->getAttribute('value')) {
+				return false;
+			}
+			return parent::setValue($value);
+		}
+
+		/**
+		 *    Accessor for starting value.
+		 *    @return string        Parsed value.
+		 *    @access public
+		 */
+		function getDefault() {
+			if ($this->getAttribute('checked') !== false) {
+				return $this->getAttribute('value');
+			}
+			return false;
+		}
+	}
+
+	/**
+	 *    Checkbox widget.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleCheckboxTag extends SimpleWidget {
-
-        /**
-         *    Starts with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleCheckboxTag($attributes) {
-            $this->SimpleWidget('input', $attributes);
-            if ($this->getAttribute('value') === false) {
-                $this->_setAttribute('value', 'on');
-            }
-        }
-
-        /**
-         *    Tag contains no content.
-         *    @return boolean        False.
-         *    @access public
-         */
-        function expectEndTag() {
-            return false;
-        }
-
-        /**
-         *    The only allowed value in the one in the
-         *    "value" attribute. The default for this
-         *    attribute is "on". If this widget is set to
-         *    true, then the usual value will be taken.
-         *    @param string $value      New value.
-         *    @return boolean           True if allowed.
-         *    @access public
-         */
-        function setValue($value) {
-            if ($value === false) {
-                return parent::setValue($value);
-            }
-            if ($value === true) {
-                return parent::setValue($this->getAttribute('value'));
-            }
-            if ($value != $this->getAttribute('value')) {
-                return false;
-            }
-            return parent::setValue($value);
-        }
-
-        /**
-         *    Accessor for starting value. The default
-         *    value is "on".
-         *    @return string        Parsed value.
-         *    @access public
-         */
-        function getDefault() {
-            if ($this->getAttribute('checked') !== false) {
-                return $this->getAttribute('value');
-            }
-            return false;
-        }
-    }
-
-    /**
-     *    A group of multiple widgets with some shared behaviour.
+	 */
+	class SimpleCheckboxTag extends SimpleWidget {
+
+		/**
+		 *    Starts with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleCheckboxTag($attributes) {
+			$this->SimpleWidget('input', $attributes);
+			if ($this->getAttribute('value') === false) {
+				$this->_setAttribute('value', 'on');
+			}
+		}
+
+		/**
+		 *    Tag contains no content.
+		 *    @return boolean        False.
+		 *    @access public
+		 */
+		function expectEndTag() {
+			return false;
+		}
+
+		/**
+		 *    The only allowed value in the one in the
+		 *    "value" attribute. The default for this
+		 *    attribute is "on". If this widget is set to
+		 *    true, then the usual value will be taken.
+		 *    @param string $value      New value.
+		 *    @return boolean           True if allowed.
+		 *    @access public
+		 */
+		function setValue($value) {
+			if ($value === false) {
+				return parent::setValue($value);
+			}
+			if ($value === true) {
+				return parent::setValue($this->getAttribute('value'));
+			}
+			if ($value != $this->getAttribute('value')) {
+				return false;
+			}
+			return parent::setValue($value);
+		}
+
+		/**
+		 *    Accessor for starting value. The default
+		 *    value is "on".
+		 *    @return string        Parsed value.
+		 *    @access public
+		 */
+		function getDefault() {
+			if ($this->getAttribute('checked') !== false) {
+				return $this->getAttribute('value');
+			}
+			return false;
+		}
+	}
+
+	/**
+	 *    A group of multiple widgets with some shared behaviour.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleTagGroup {
-        protected $_widgets = array();
-
-        /**
-         *    Adds a tag to the group.
-         *    @param SimpleWidget $widget
-         *    @access public
-         */
-        function addWidget($widget) {
-            $this->_widgets[] = $widget;
-        }
-
-        /**
-         *    Accessor to widget set.
-         *    @return array        All widgets.
-         *    @access protected
-         */
-        function &_getWidgets() {
-            return $this->_widgets;
-        }
-
-        /**
-         *    Accessor for an attribute.
-         *    @param string $label    Attribute name.
-         *    @return boolean         Always false.
-         *    @access public
-         */
-        function getAttribute($label) {
-            return false;
-        }
-
-        /**
-         *    Fetches the name for the widget from the first
-         *    member.
-         *    @return string        Name of widget.
-         *    @access public
-         */
-        function getName() {
-            if (count($this->_widgets) > 0) {
-                return $this->_widgets[0]->getName();
-            }
-        }
-
-        /**
-         *    Scans the widgets for one with the appropriate
-         *    ID field.
-         *    @param string $id        ID value to try.
-         *    @return boolean          True if matched.
-         *    @access public
-         */
-        function isId($id) {
-            for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
-                if ($this->_widgets[$i]->isId($id)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         *    Scans the widgets for one with the appropriate
-         *    attached label.
-         *    @param string $label     Attached label to try.
-         *    @return boolean          True if matched.
-         *    @access public
-         */
-        function isLabel($label) {
-            for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
-                if ($this->_widgets[$i]->isLabel($label)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         *    Dispatches the value into the form encoded packet.
-         *    @param SimpleEncoding $encoding    Form packet.
-         *    @access public
-         */
-        function write($encoding) {
-            $encoding->add($this->getName(), $this->getValue());
-        }
-    }
-
-    /**
-     *    A group of tags with the same name within a form.
+	 */
+	class SimpleTagGroup {
+		protected $_widgets = array();
+
+		/**
+		 *    Adds a tag to the group.
+		 *    @param SimpleWidget $widget
+		 *    @access public
+		 */
+		function addWidget($widget) {
+			$this->_widgets[] = $widget;
+		}
+
+		/**
+		 *    Accessor to widget set.
+		 *    @return array        All widgets.
+		 *    @access protected
+		 */
+		function &_getWidgets() {
+			return $this->_widgets;
+		}
+
+		/**
+		 *    Accessor for an attribute.
+		 *    @param string $label    Attribute name.
+		 *    @return boolean         Always false.
+		 *    @access public
+		 */
+		function getAttribute($label) {
+			return false;
+		}
+
+		/**
+		 *    Fetches the name for the widget from the first
+		 *    member.
+		 *    @return string        Name of widget.
+		 *    @access public
+		 */
+		function getName() {
+			if (count($this->_widgets) > 0) {
+				return $this->_widgets[0]->getName();
+			}
+		}
+
+		/**
+		 *    Scans the widgets for one with the appropriate
+		 *    ID field.
+		 *    @param string $id        ID value to try.
+		 *    @return boolean          True if matched.
+		 *    @access public
+		 */
+		function isId($id) {
+			for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
+				if ($this->_widgets[$i]->isId($id)) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 *    Scans the widgets for one with the appropriate
+		 *    attached label.
+		 *    @param string $label     Attached label to try.
+		 *    @return boolean          True if matched.
+		 *    @access public
+		 */
+		function isLabel($label) {
+			for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
+				if ($this->_widgets[$i]->isLabel($label)) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 *    Dispatches the value into the form encoded packet.
+		 *    @param SimpleEncoding $encoding    Form packet.
+		 *    @access public
+		 */
+		function write($encoding) {
+			$encoding->add($this->getName(), $this->getValue());
+		}
+	}
+
+	/**
+	 *    A group of tags with the same name within a form.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleCheckboxGroup extends SimpleTagGroup {
-
-        /**
-         *    Accessor for current selected widget or false
-         *    if none.
-         *    @return string/array     Widget values or false if none.
-         *    @access public
-         */
-        function getValue() {
-            $values = array();
-            $widgets = $this->_getWidgets();
-            for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-                if ($widgets[$i]->getValue() !== false) {
-                    $values[] = $widgets[$i]->getValue();
-                }
-            }
-            return $this->_coerceValues($values);
-        }
-
-        /**
-         *    Accessor for starting value that is active.
-         *    @return string/array      Widget values or false if none.
-         *    @access public
-         */
-        function getDefault() {
-            $values = array();
-            $widgets = $this->_getWidgets();
-            for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-                if ($widgets[$i]->getDefault() !== false) {
-                    $values[] = $widgets[$i]->getDefault();
-                }
-            }
-            return $this->_coerceValues($values);
-        }
-
-        /**
-         *    Accessor for current set values.
-         *    @param string/array/boolean $values   Either a single string, a
-         *                                          hash or false for nothing set.
-         *    @return boolean                       True if all values can be set.
-         *    @access public
-         */
-        function setValue($values) {
-            $values = $this->_makeArray($values);
-            if (! $this->_valuesArePossible($values)) {
-                return false;
-            }
-            $widgets = $this->_getWidgets();
-            for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-                $possible = $widgets[$i]->getAttribute('value');
-                if (in_array($widgets[$i]->getAttribute('value'), $values)) {
-                    $widgets[$i]->setValue($possible);
-                } else {
-                    $widgets[$i]->setValue(false);
-                }
-            }
-            return true;
-        }
-
-        /**
-         *    Tests to see if a possible value set is legal.
-         *    @param string/array/boolean $values   Either a single string, a
-         *                                          hash or false for nothing set.
-         *    @return boolean                       False if trying to set a
-         *                                          missing value.
-         *    @access private
-         */
-        function _valuesArePossible($values) {
-            $matches = array();
-            $widgets = $this->_getWidgets();
-            for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-                $possible = $widgets[$i]->getAttribute('value');
-                if (in_array($possible, $values)) {
-                    $matches[] = $possible;
-                }
-            }
-            return ($values == $matches);
-        }
-
-        /**
-         *    Converts the output to an appropriate format. This means
-         *    that no values is false, a single value is just that
-         *    value and only two or more are contained in an array.
-         *    @param array $values           List of values of widgets.
-         *    @return string/array/boolean   Expected format for a tag.
-         *    @access private
-         */
-        function _coerceValues($values) {
-            if (count($values) == 0) {
-                return false;
-            } elseif (count($values) == 1) {
-                return $values[0];
-            } else {
-                return $values;
-            }
-        }
-
-        /**
-         *    Converts false or string into array. The opposite of
-         *    the coercian method.
-         *    @param string/array/boolean $value  A single item is converted
-         *                                        to a one item list. False
-         *                                        gives an empty list.
-         *    @return array                       List of values, possibly empty.
-         *    @access private
-         */
-        function _makeArray($value) {
-            if ($value === false) {
-                return array();
-            }
-            if (is_string($value)) {
-                return array($value);
-            }
-            return $value;
-        }
-    }
-
-    /**
-     *    A group of tags with the same name within a form.
-     *    Used for radio buttons.
+	 */
+	class SimpleCheckboxGroup extends SimpleTagGroup {
+
+		/**
+		 *    Accessor for current selected widget or false
+		 *    if none.
+		 *    @return string/array     Widget values or false if none.
+		 *    @access public
+		 */
+		function getValue() {
+			$values = array();
+			$widgets = $this->_getWidgets();
+			for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+				if ($widgets[$i]->getValue() !== false) {
+					$values[] = $widgets[$i]->getValue();
+				}
+			}
+			return $this->_coerceValues($values);
+		}
+
+		/**
+		 *    Accessor for starting value that is active.
+		 *    @return string/array      Widget values or false if none.
+		 *    @access public
+		 */
+		function getDefault() {
+			$values = array();
+			$widgets = $this->_getWidgets();
+			for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+				if ($widgets[$i]->getDefault() !== false) {
+					$values[] = $widgets[$i]->getDefault();
+				}
+			}
+			return $this->_coerceValues($values);
+		}
+
+		/**
+		 *    Accessor for current set values.
+		 *    @param string/array/boolean $values   Either a single string, a
+		 *                                          hash or false for nothing set.
+		 *    @return boolean                       True if all values can be set.
+		 *    @access public
+		 */
+		function setValue($values) {
+			$values = $this->_makeArray($values);
+			if (! $this->_valuesArePossible($values)) {
+				return false;
+			}
+			$widgets = $this->_getWidgets();
+			for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+				$possible = $widgets[$i]->getAttribute('value');
+				if (in_array($widgets[$i]->getAttribute('value'), $values)) {
+					$widgets[$i]->setValue($possible);
+				} else {
+					$widgets[$i]->setValue(false);
+				}
+			}
+			return true;
+		}
+
+		/**
+		 *    Tests to see if a possible value set is legal.
+		 *    @param string/array/boolean $values   Either a single string, a
+		 *                                          hash or false for nothing set.
+		 *    @return boolean                       False if trying to set a
+		 *                                          missing value.
+		 *    @access private
+		 */
+		function _valuesArePossible($values) {
+			$matches = array();
+			$widgets = $this->_getWidgets();
+			for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+				$possible = $widgets[$i]->getAttribute('value');
+				if (in_array($possible, $values)) {
+					$matches[] = $possible;
+				}
+			}
+			return ($values == $matches);
+		}
+
+		/**
+		 *    Converts the output to an appropriate format. This means
+		 *    that no values is false, a single value is just that
+		 *    value and only two or more are contained in an array.
+		 *    @param array $values           List of values of widgets.
+		 *    @return string/array/boolean   Expected format for a tag.
+		 *    @access private
+		 */
+		function _coerceValues($values) {
+			if (count($values) == 0) {
+				return false;
+			} elseif (count($values) == 1) {
+				return $values[0];
+			} else {
+				return $values;
+			}
+		}
+
+		/**
+		 *    Converts false or string into array. The opposite of
+		 *    the coercian method.
+		 *    @param string/array/boolean $value  A single item is converted
+		 *                                        to a one item list. False
+		 *                                        gives an empty list.
+		 *    @return array                       List of values, possibly empty.
+		 *    @access private
+		 */
+		function _makeArray($value) {
+			if ($value === false) {
+				return array();
+			}
+			if (is_string($value)) {
+				return array($value);
+			}
+			return $value;
+		}
+	}
+
+	/**
+	 *    A group of tags with the same name within a form.
+	 *    Used for radio buttons.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleRadioGroup extends SimpleTagGroup {
-
-        /**
-         *    Each tag is tried in turn until one is
-         *    successfully set. The others will be
-         *    unchecked if successful.
-         *    @param string $value      New value.
-         *    @return boolean           True if any allowed.
-         *    @access public
-         */
-        function setValue($value) {
-            if (! $this->_valueIsPossible($value)) {
-                return false;
-            }
-            $index = false;
-            $widgets = $this->_getWidgets();
-            for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-                if (! $widgets[$i]->setValue($value)) {
-                    $widgets[$i]->setValue(false);
-                }
-            }
-            return true;
-        }
-
-        /**
-         *    Tests to see if a value is allowed.
-         *    @param string    Attempted value.
-         *    @return boolean  True if a valid value.
-         *    @access private
-         */
-        function _valueIsPossible($value) {
-            $widgets = $this->_getWidgets();
-            for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-                if ($widgets[$i]->getAttribute('value') == $value) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         *    Accessor for current selected widget or false
-         *    if none.
-         *    @return string/boolean   Value attribute or
-         *                             content of opton.
-         *    @access public
-         */
-        function getValue() {
-            $widgets = $this->_getWidgets();
-            for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-                if ($widgets[$i]->getValue() !== false) {
-                    return $widgets[$i]->getValue();
-                }
-            }
-            return false;
-        }
-
-        /**
-         *    Accessor for starting value that is active.
-         *    @return string/boolean      Value of first checked
-         *                                widget or false if none.
-         *    @access public
-         */
-        function getDefault() {
-            $widgets = $this->_getWidgets();
-            for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-                if ($widgets[$i]->getDefault() !== false) {
-                    return $widgets[$i]->getDefault();
-                }
-            }
-            return false;
-        }
-    }
-
-    /**
-     *    Tag to keep track of labels.
+	 */
+	class SimpleRadioGroup extends SimpleTagGroup {
+
+		/**
+		 *    Each tag is tried in turn until one is
+		 *    successfully set. The others will be
+		 *    unchecked if successful.
+		 *    @param string $value      New value.
+		 *    @return boolean           True if any allowed.
+		 *    @access public
+		 */
+		function setValue($value) {
+			if (! $this->_valueIsPossible($value)) {
+				return false;
+			}
+			$index = false;
+			$widgets = $this->_getWidgets();
+			for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+				if (! $widgets[$i]->setValue($value)) {
+					$widgets[$i]->setValue(false);
+				}
+			}
+			return true;
+		}
+
+		/**
+		 *    Tests to see if a value is allowed.
+		 *    @param string    Attempted value.
+		 *    @return boolean  True if a valid value.
+		 *    @access private
+		 */
+		function _valueIsPossible($value) {
+			$widgets = $this->_getWidgets();
+			for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+				if ($widgets[$i]->getAttribute('value') == $value) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 *    Accessor for current selected widget or false
+		 *    if none.
+		 *    @return string/boolean   Value attribute or
+		 *                             content of opton.
+		 *    @access public
+		 */
+		function getValue() {
+			$widgets = $this->_getWidgets();
+			for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+				if ($widgets[$i]->getValue() !== false) {
+					return $widgets[$i]->getValue();
+				}
+			}
+			return false;
+		}
+
+		/**
+		 *    Accessor for starting value that is active.
+		 *    @return string/boolean      Value of first checked
+		 *                                widget or false if none.
+		 *    @access public
+		 */
+		function getDefault() {
+			$widgets = $this->_getWidgets();
+			for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+				if ($widgets[$i]->getDefault() !== false) {
+					return $widgets[$i]->getDefault();
+				}
+			}
+			return false;
+		}
+	}
+
+	/**
+	 *    Tag to keep track of labels.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleLabelTag extends SimpleTag {
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleLabelTag($attributes) {
-            $this->SimpleTag('label', $attributes);
-        }
-
-        /**
-         *    Access for the ID to attach the label to.
-         *    @return string        For attribute.
-         *    @access public
-         */
-        function getFor() {
-            return $this->getAttribute('for');
-        }
-    }
-
-    /**
-     *    Tag to aid parsing the form.
+	 */
+	class SimpleLabelTag extends SimpleTag {
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleLabelTag($attributes) {
+			$this->SimpleTag('label', $attributes);
+		}
+
+		/**
+		 *    Access for the ID to attach the label to.
+		 *    @return string        For attribute.
+		 *    @access public
+		 */
+		function getFor() {
+			return $this->getAttribute('for');
+		}
+	}
+
+	/**
+	 *    Tag to aid parsing the form.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleFormTag extends SimpleTag {
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleFormTag($attributes) {
-            $this->SimpleTag('form', $attributes);
-        }
-    }
-
-    /**
-     *    Tag to aid parsing the frames in a page.
+	 */
+	class SimpleFormTag extends SimpleTag {
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleFormTag($attributes) {
+			$this->SimpleTag('form', $attributes);
+		}
+	}
+
+	/**
+	 *    Tag to aid parsing the frames in a page.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleFrameTag extends SimpleTag {
-
-        /**
-         *    Starts with a named tag with attributes only.
-         *    @param hash $attributes    Attribute names and
-         *                               string values.
-         */
-        function SimpleFrameTag($attributes) {
-            $this->SimpleTag('frame', $attributes);
-        }
-
-        /**
-         *    Tag contains no content.
-         *    @return boolean        False.
-         *    @access public
-         */
-        function expectEndTag() {
-            return false;
-        }
-    }
\ No newline at end of file
+	 */
+	class SimpleFrameTag extends SimpleTag {
+
+		/**
+		 *    Starts with a named tag with attributes only.
+		 *    @param hash $attributes    Attribute names and
+		 *                               string values.
+		 */
+		function SimpleFrameTag($attributes) {
+			$this->SimpleTag('frame', $attributes);
+		}
+
+		/**
+		 *    Tag contains no content.
+		 *    @return boolean        False.
+		 *    @access public
+		 */
+		function expectEndTag() {
+			return false;
+		}
+	}
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -66,7 +66,7 @@ 
          *    @access public
          */
         function addContent($content) {
-            $this->_content .= (string)$content;
+            $this->_content .= (string) $content;
         }
 
         /**
@@ -103,10 +103,10 @@ 
          */
         function getAttribute($label) {
             $label = strtolower($label);
-            if (! isset($this->_attributes[$label])) {
+            if (!isset($this->_attributes[$label])) {
                 return false;
             }
-            return (string)$this->_attributes[$label];
+            return (string) $this->_attributes[$label];
         }
 
         /**
@@ -247,7 +247,7 @@ 
          *    @access public
          */
         function getValue() {
-            if (! $this->_is_set) {
+            if (!$this->_is_set) {
                 return $this->getDefault();
             }
             return $this->_value;
@@ -471,7 +471,7 @@ 
          *    @param integer $y                  Y coordinate of click.
          *    @access public
          */
-        function write($encoding){//, $x, $y) {
+        function write($encoding) {//, $x, $y) {
             if ($this->getName()) {
                 $encoding->add($this->getName() . '.x', $x);
                 $encoding->add($this->getName() . '.y', $y);
@@ -608,7 +608,7 @@ 
             if ($this->_wrapIsEnabled()) {
                 return wordwrap(
                         $text,
-                        (integer)$this->getAttribute('cols'),
+                        (integer) $this->getAttribute('cols'),
                         "\r\n");
             }
             return $text;
@@ -655,7 +655,7 @@ 
          *    @access public
          */
         function write($encoding) {
-            if (! file_exists($this->getValue())) {
+            if (!file_exists($this->getValue())) {
                 return;
             }
             $encoding->attach(
@@ -826,7 +826,7 @@ 
                         break;
                     }
                 }
-                if (! $success) {
+                if (!$success) {
                     return false;
                 }
             }
@@ -1168,7 +1168,7 @@ 
          */
         function setValue($values) {
             $values = $this->_makeArray($values);
-            if (! $this->_valuesArePossible($values)) {
+            if (!$this->_valuesArePossible($values)) {
                 return false;
             }
             $widgets = $this->_getWidgets();
@@ -1258,13 +1258,13 @@ 
          *    @access public
          */
         function setValue($value) {
-            if (! $this->_valueIsPossible($value)) {
+            if (!$this->_valueIsPossible($value)) {
                 return false;
             }
             $index = false;
             $widgets = $this->_getWidgets();
             for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-                if (! $widgets[$i]->setValue($value)) {
+                if (!$widgets[$i]->setValue($value)) {
                     $widgets[$i]->setValue(false);
                 }
             }

tests/test_tools/simpletest/test_case.php

Doc Comments +2 added lines, -12 removed lines

@@ -330,13 +330,7 @@ 
 
         /**
          *    Uses a stack trace to find the line of an assertion.
-         *    @param string $format    String formatting.
-         *    @param array $stack      Stack frames top most first. Only
-         *                             needed if not using the PHP
-         *                             backtrace function.
-         *    @return string           Line number of first assert*
-         *                             method embedded in format string.
-         *    @access public
+         * @param string $stack
          */
         function getAssertionLine($stack = false) {
             if ($stack === false) {
@@ -349,7 +343,7 @@ 
          *    Sends a formatted dump of a variable to the
          *    test suite for those emergency debugging
          *    situations.
-         *    @param mixed $variable    Variable to display.
+         *    @param string|boolean $variable    Variable to display.
          *    @param string $message    Message to display.
          *    @return mixed             The original variable.
          *    @access public
@@ -440,10 +434,6 @@ 
         /**
          *    Adds a test into the suite by class name. The class will
          *    be instantiated as needed.
-         *    @param SimpleTestCase $test_case  Suite or individual test
-         *                                      case implementing the
-         *                                      runnable test interface.
-         *    @access public
          */
         function addTestClass($class) {
             if ($this->_getBaseTestCase($class) == 'grouptest') {

Indentation +672 added lines, -672 removed lines

@@ -1,689 +1,689 @@
 <?php
-    /**
-     *	Base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	UnitTester
-     *	@version	$Id: test_case.php 2309 2007-10-08 03:24:07Z wei $
-     */
-
-    /**#@+
+	/**
+	 *	Base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	UnitTester
+	 *	@version	$Id: test_case.php 2309 2007-10-08 03:24:07Z wei $
+	 */
+
+	/**#@+
      * Includes SimpleTest files and defined the root constant
      * for dependent libraries.
      */
-    require_once(dirname(__FILE__) . '/invoker.php');
-    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');
-    require_once(dirname(__FILE__) . '/simpletest.php');
-    if (version_compare(phpversion(), '5') >= 0) {
-        require_once(dirname(__FILE__) . '/exceptions.php');
-        require_once(dirname(__FILE__) . '/reflection_php5.php');
-    } else {
-        require_once(dirname(__FILE__) . '/reflection_php4.php');
-    }
-    if (! defined('SIMPLE_TEST')) {
-        /**
-         * @ignore
-         */
-        define('SIMPLE_TEST', dirname(__FILE__) . '/');
-    }
-    /**#@-*/
-
-    /**
-     *    Basic test case. This is the smallest unit of a test
-     *    suite. It searches for
-     *    all methods that start with the the string "test" and
-     *    runs them. Working test cases extend this class.
+	require_once(dirname(__FILE__) . '/invoker.php');
+	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');
+	require_once(dirname(__FILE__) . '/simpletest.php');
+	if (version_compare(phpversion(), '5') >= 0) {
+		require_once(dirname(__FILE__) . '/exceptions.php');
+		require_once(dirname(__FILE__) . '/reflection_php5.php');
+	} else {
+		require_once(dirname(__FILE__) . '/reflection_php4.php');
+	}
+	if (! defined('SIMPLE_TEST')) {
+		/**
+		 * @ignore
+		 */
+		define('SIMPLE_TEST', dirname(__FILE__) . '/');
+	}
+	/**#@-*/
+
+	/**
+	 *    Basic test case. This is the smallest unit of a test
+	 *    suite. It searches for
+	 *    all methods that start with the the string "test" and
+	 *    runs them. Working test cases extend this class.
 	 *    @package		SimpleTest
 	 *    @subpackage	UnitTester
-     */
-    class SimpleTestCase {
-        protected $_label = false;
-        protected $_reporter;
-        protected $_observers;
-
-        /**
-         *    Sets up the test with no display.
-         *    @param string $label    If no test name is given then
-         *                            the class name is used.
-         *    @access public
-         */
-        function SimpleTestCase($label = false) {
-            if ($label) {
-                $this->_label = $label;
-            }
-        }
-
-        /**
-         *    Accessor for the test name for subclasses.
-         *    @return string           Name of the test.
-         *    @access public
-         */
-        function getLabel() {
-            return $this->_label ? $this->_label : get_class($this);
-        }
-
-        /**
-         *    Used to invoke the single tests.
-         *    @return SimpleInvoker        Individual test runner.
-         *    @access public
-         */
-        function createInvoker() {
-            $invoker = new SimpleErrorTrappingInvoker(new SimpleInvoker($this));
-            if (version_compare(phpversion(), '5') >= 0) {
-                $invoker = new SimpleExceptionTrappingInvoker($invoker);
-            }
-            return $invoker;
-        }
-
-        /**
-         *    Uses reflection to run every method within itself
-         *    starting with the string "test" unless a method
-         *    is specified.
-         *    @param SimpleReporter $reporter    Current test reporter.
-         *    @access public
-         */
-        function run($reporter) {
-            SimpleTest::setCurrent($this);
-            $this->_reporter = $reporter;
-            $this->_reporter->paintCaseStart($this->getLabel());
-            foreach ($this->getTests() as $method) {
-                if ($this->_reporter->shouldInvoke($this->getLabel(), $method)) {
-                    $invoker = $this->_reporter->createInvoker($this->createInvoker());
-                    $invoker->before($method);
-                    $invoker->invoke($method);
-                    $invoker->after($method);
-                }
-            }
-            $this->_reporter->paintCaseEnd($this->getLabel());
-            unset($this->_reporter);
-            return $reporter->getStatus();
-        }
-
-        /**
-         *    Gets a list of test names. Normally that will
-         *    be all internal methods that start with the
-         *    name "test". This method should be overridden
-         *    if you want a different rule.
-         *    @return array        List of test names.
-         *    @access public
-         */
-        function getTests() {
-            $methods = array();
-            foreach (get_class_methods(get_class($this)) as $method) {
-                if ($this->_isTest($method)) {
-                    $methods[] = $method;
-                }
-            }
-            return $methods;
-        }
-
-        /**
-         *    Tests to see if the method is a test that should
-         *    be run. Currently any method that starts with 'test'
-         *    is a candidate unless it is the constructor.
-         *    @param string $method        Method name to try.
-         *    @return boolean              True if test method.
-         *    @access protected
-         */
-        function _isTest($method) {
-            if (strtolower(substr($method, 0, 4)) == 'test') {
-                return ! SimpleTestCompatibility::isA($this, strtolower($method));
-            }
-            return false;
-        }
-
-        /**
-         *    Announces the start of the test.
-         *    @param string $method    Test method just started.
-         *    @access public
-         */
-        function before($method) {
-            $this->_reporter->paintMethodStart($method);
-            $this->_observers = array();
-        }
-
-        /**
-         *    Sets up unit test wide variables at the start
-         *    of each test method. To be overridden in
-         *    actual user test cases.
-         *    @access public
-         */
-        function setUp() {
-        }
-
-        /**
-         *    Clears the data set in the setUp() method call.
-         *    To be overridden by the user in actual user test cases.
-         *    @access public
-         */
-        function tearDown() {
-        }
-
-        /**
-         *    Announces the end of the test. Includes private clean up.
-         *    @param string $method    Test method just finished.
-         *    @access public
-         */
-        function after($method) {
-            for ($i = 0; $i < count($this->_observers); $i++) {
-                $this->_observers[$i]->atTestEnd($method);
-            }
-            $this->_reporter->paintMethodEnd($method);
-        }
-
-        /**
-         *    Sets up an observer for the test end.
-         *    @param object $observer    Must have atTestEnd()
-         *                               method.
-         *    @access public
-         */
-        function tell($observer) {
-            $this->_observers[] = $observer;
-        }
-
-        /**
-         *    Sends a pass event with a message.
-         *    @param string $message        Message to send.
-         *    @access public
-         */
-        function pass($message = "Pass") {
-            if (! isset($this->_reporter)) {
-                trigger_error('Can only make assertions within test methods');
-            }
-            $this->_reporter->paintPass(
-                    $message . $this->getAssertionLine());
-            return true;
-        }
-
-        /**
-         *    Sends a fail event with a message.
-         *    @param string $message        Message to send.
-         *    @access public
-         */
-        function fail($message = "Fail") {
-            if (! isset($this->_reporter)) {
-                trigger_error('Can only make assertions within test methods');
-            }
-            $this->_reporter->paintFail(
-                    $message . $this->getAssertionLine());
-            return false;
-        }
-
-        /**
-         *    Formats a PHP error and dispatches it to the
-         *    reporter.
-         *    @param integer $severity  PHP error code.
-         *    @param string $message    Text of error.
-         *    @param string $file       File error occoured in.
-         *    @param integer $line      Line number of error.
-         *    @access public
-         */
-        function error($severity, $message, $file, $line) {
-            if (! isset($this->_reporter)) {
-                trigger_error('Can only make assertions within test methods');
-            }
-            $this->_reporter->paintError(
-                    "Unexpected PHP error [$message] severity [$severity] in [$file] line [$line]");
-        }
-
-        /**
-         *    Formats an exception and dispatches it to the
-         *    reporter.
-         *    @param Exception $exception    Object thrown.
-         *    @access public
-         */
-        function exception($exception) {
-            $this->_reporter->paintError(
-                    'Unexpected exception of type [' . get_class($exception) .
-                    '] with message ['. $exception->getMessage() .
-                    '] in ['. $exception->getFile() .
-                    '] line [' . $exception->getLine() .
+	 */
+	class SimpleTestCase {
+		protected $_label = false;
+		protected $_reporter;
+		protected $_observers;
+
+		/**
+		 *    Sets up the test with no display.
+		 *    @param string $label    If no test name is given then
+		 *                            the class name is used.
+		 *    @access public
+		 */
+		function SimpleTestCase($label = false) {
+			if ($label) {
+				$this->_label = $label;
+			}
+		}
+
+		/**
+		 *    Accessor for the test name for subclasses.
+		 *    @return string           Name of the test.
+		 *    @access public
+		 */
+		function getLabel() {
+			return $this->_label ? $this->_label : get_class($this);
+		}
+
+		/**
+		 *    Used to invoke the single tests.
+		 *    @return SimpleInvoker        Individual test runner.
+		 *    @access public
+		 */
+		function createInvoker() {
+			$invoker = new SimpleErrorTrappingInvoker(new SimpleInvoker($this));
+			if (version_compare(phpversion(), '5') >= 0) {
+				$invoker = new SimpleExceptionTrappingInvoker($invoker);
+			}
+			return $invoker;
+		}
+
+		/**
+		 *    Uses reflection to run every method within itself
+		 *    starting with the string "test" unless a method
+		 *    is specified.
+		 *    @param SimpleReporter $reporter    Current test reporter.
+		 *    @access public
+		 */
+		function run($reporter) {
+			SimpleTest::setCurrent($this);
+			$this->_reporter = $reporter;
+			$this->_reporter->paintCaseStart($this->getLabel());
+			foreach ($this->getTests() as $method) {
+				if ($this->_reporter->shouldInvoke($this->getLabel(), $method)) {
+					$invoker = $this->_reporter->createInvoker($this->createInvoker());
+					$invoker->before($method);
+					$invoker->invoke($method);
+					$invoker->after($method);
+				}
+			}
+			$this->_reporter->paintCaseEnd($this->getLabel());
+			unset($this->_reporter);
+			return $reporter->getStatus();
+		}
+
+		/**
+		 *    Gets a list of test names. Normally that will
+		 *    be all internal methods that start with the
+		 *    name "test". This method should be overridden
+		 *    if you want a different rule.
+		 *    @return array        List of test names.
+		 *    @access public
+		 */
+		function getTests() {
+			$methods = array();
+			foreach (get_class_methods(get_class($this)) as $method) {
+				if ($this->_isTest($method)) {
+					$methods[] = $method;
+				}
+			}
+			return $methods;
+		}
+
+		/**
+		 *    Tests to see if the method is a test that should
+		 *    be run. Currently any method that starts with 'test'
+		 *    is a candidate unless it is the constructor.
+		 *    @param string $method        Method name to try.
+		 *    @return boolean              True if test method.
+		 *    @access protected
+		 */
+		function _isTest($method) {
+			if (strtolower(substr($method, 0, 4)) == 'test') {
+				return ! SimpleTestCompatibility::isA($this, strtolower($method));
+			}
+			return false;
+		}
+
+		/**
+		 *    Announces the start of the test.
+		 *    @param string $method    Test method just started.
+		 *    @access public
+		 */
+		function before($method) {
+			$this->_reporter->paintMethodStart($method);
+			$this->_observers = array();
+		}
+
+		/**
+		 *    Sets up unit test wide variables at the start
+		 *    of each test method. To be overridden in
+		 *    actual user test cases.
+		 *    @access public
+		 */
+		function setUp() {
+		}
+
+		/**
+		 *    Clears the data set in the setUp() method call.
+		 *    To be overridden by the user in actual user test cases.
+		 *    @access public
+		 */
+		function tearDown() {
+		}
+
+		/**
+		 *    Announces the end of the test. Includes private clean up.
+		 *    @param string $method    Test method just finished.
+		 *    @access public
+		 */
+		function after($method) {
+			for ($i = 0; $i < count($this->_observers); $i++) {
+				$this->_observers[$i]->atTestEnd($method);
+			}
+			$this->_reporter->paintMethodEnd($method);
+		}
+
+		/**
+		 *    Sets up an observer for the test end.
+		 *    @param object $observer    Must have atTestEnd()
+		 *                               method.
+		 *    @access public
+		 */
+		function tell($observer) {
+			$this->_observers[] = $observer;
+		}
+
+		/**
+		 *    Sends a pass event with a message.
+		 *    @param string $message        Message to send.
+		 *    @access public
+		 */
+		function pass($message = "Pass") {
+			if (! isset($this->_reporter)) {
+				trigger_error('Can only make assertions within test methods');
+			}
+			$this->_reporter->paintPass(
+					$message . $this->getAssertionLine());
+			return true;
+		}
+
+		/**
+		 *    Sends a fail event with a message.
+		 *    @param string $message        Message to send.
+		 *    @access public
+		 */
+		function fail($message = "Fail") {
+			if (! isset($this->_reporter)) {
+				trigger_error('Can only make assertions within test methods');
+			}
+			$this->_reporter->paintFail(
+					$message . $this->getAssertionLine());
+			return false;
+		}
+
+		/**
+		 *    Formats a PHP error and dispatches it to the
+		 *    reporter.
+		 *    @param integer $severity  PHP error code.
+		 *    @param string $message    Text of error.
+		 *    @param string $file       File error occoured in.
+		 *    @param integer $line      Line number of error.
+		 *    @access public
+		 */
+		function error($severity, $message, $file, $line) {
+			if (! isset($this->_reporter)) {
+				trigger_error('Can only make assertions within test methods');
+			}
+			$this->_reporter->paintError(
+					"Unexpected PHP error [$message] severity [$severity] in [$file] line [$line]");
+		}
+
+		/**
+		 *    Formats an exception and dispatches it to the
+		 *    reporter.
+		 *    @param Exception $exception    Object thrown.
+		 *    @access public
+		 */
+		function exception($exception) {
+			$this->_reporter->paintError(
+					'Unexpected exception of type [' . get_class($exception) .
+					'] with message ['. $exception->getMessage() .
+					'] in ['. $exception->getFile() .
+					'] line [' . $exception->getLine() .
 					'] stack [' . $exception->getTraceAsString() .']');
-        }
-
-        /**
-         *    Sends a user defined event to the test reporter.
-         *    This is for small scale extension where
-         *    both the test case and either the reporter or
-         *    display are subclassed.
-         *    @param string $type       Type of event.
-         *    @param mixed $payload     Object or message to deliver.
-         *    @access public
-         */
-        function signal($type, $payload) {
-            if (! isset($this->_reporter)) {
-                trigger_error('Can only make assertions within test methods');
-            }
-            $this->_reporter->paintSignal($type, $payload);
-        }
-
-        /**
-         *    Cancels any outstanding errors.
-         *    @access public
-         */
-        function swallowErrors() {
-            $queue = &SimpleErrorQueue::instance();
-            $queue->clear();
-        }
-
-        /**
-         *    Runs an expectation directly, for extending the
-         *    tests with new expectation classes.
-         *    @param SimpleExpectation $expectation  Expectation subclass.
-         *    @param mixed $compare               Value to compare.
-         *    @param string $message                 Message to display.
-         *    @return boolean                        True on pass
-         *    @access public
-         */
-        function assert($expectation, $compare, $message = '%s') {
-            return $this->assertTrue(
-                    $expectation->test($compare),
-                    sprintf($message, $expectation->overlayMessage($compare)));
-        }
-
-        /**
-         *	  @deprecated
-         */
-        function assertExpectation($expectation, $compare, $message = '%s') {
-        	return $this->assert($expectation, $compare, $message);
-        }
-
-        /**
-         *    Called from within the test methods to register
-         *    passes and failures.
-         *    @param boolean $result    Pass on true.
-         *    @param string $message    Message to display describing
-         *                              the test state.
-         *    @return boolean           True on pass
-         *    @access public
-         */
-        function assertTrue($result, $message = false) {
-            if (! $message) {
-                $message = 'True assertion got ' . ($result ? 'True' : 'False');
-            }
-            if ($result) {
-                return $this->pass($message);
-            } else {
-                return $this->fail($message);
-            }
-        }
-
-        /**
-         *    Will be true on false and vice versa. False
-         *    is the PHP definition of false, so that null,
-         *    empty strings, zero and an empty array all count
-         *    as false.
-         *    @param boolean $result    Pass on false.
-         *    @param string $message    Message to display.
-         *    @return boolean           True on pass
-         *    @access public
-         */
-        function assertFalse($result, $message = false) {
-            if (! $message) {
-                $message = 'False assertion got ' . ($result ? 'True' : 'False');
-            }
-            return $this->assertTrue(! $result, $message);
-        }
-
-        /**
-         *    Uses a stack trace to find the line of an assertion.
-         *    @param string $format    String formatting.
-         *    @param array $stack      Stack frames top most first. Only
-         *                             needed if not using the PHP
-         *                             backtrace function.
-         *    @return string           Line number of first assert*
-         *                             method embedded in format string.
-         *    @access public
-         */
-        function getAssertionLine($stack = false) {
-            if ($stack === false) {
-                $stack = SimpleTestCompatibility::getStackTrace();
-            }
-            return SimpleDumper::getFormattedAssertionLine($stack);
-        }
-
-        /**
-         *    Sends a formatted dump of a variable to the
-         *    test suite for those emergency debugging
-         *    situations.
-         *    @param mixed $variable    Variable to display.
-         *    @param string $message    Message to display.
-         *    @return mixed             The original variable.
-         *    @access public
-         */
-        function dump($variable, $message = false) {
-            $formatted = SimpleDumper::dump($variable);
-            if ($message) {
-                $formatted = $message . "\n" . $formatted;
-            }
-            $this->_reporter->paintFormattedMessage($formatted);
-            return $variable;
-        }
-
-        /**
-         *    Dispatches a text message straight to the
-         *    test suite. Useful for status bar displays.
-         *    @param string $message        Message to show.
-         *    @access public
-         */
-        function sendMessage($message) {
-            $this->_reporter->PaintMessage($message);
-        }
-
-        /**
-         *    Accessor for the number of subtests.
-         *    @return integer           Number of test cases.
-         *    @access public
-         *    @static
-         */
-        static function getSize() {
-            return 1;
-        }
-    }
-
-    /**
-     *    This is a composite test class for combining
-     *    test cases and other RunnableTest classes into
-     *    a group test.
+		}
+
+		/**
+		 *    Sends a user defined event to the test reporter.
+		 *    This is for small scale extension where
+		 *    both the test case and either the reporter or
+		 *    display are subclassed.
+		 *    @param string $type       Type of event.
+		 *    @param mixed $payload     Object or message to deliver.
+		 *    @access public
+		 */
+		function signal($type, $payload) {
+			if (! isset($this->_reporter)) {
+				trigger_error('Can only make assertions within test methods');
+			}
+			$this->_reporter->paintSignal($type, $payload);
+		}
+
+		/**
+		 *    Cancels any outstanding errors.
+		 *    @access public
+		 */
+		function swallowErrors() {
+			$queue = &SimpleErrorQueue::instance();
+			$queue->clear();
+		}
+
+		/**
+		 *    Runs an expectation directly, for extending the
+		 *    tests with new expectation classes.
+		 *    @param SimpleExpectation $expectation  Expectation subclass.
+		 *    @param mixed $compare               Value to compare.
+		 *    @param string $message                 Message to display.
+		 *    @return boolean                        True on pass
+		 *    @access public
+		 */
+		function assert($expectation, $compare, $message = '%s') {
+			return $this->assertTrue(
+					$expectation->test($compare),
+					sprintf($message, $expectation->overlayMessage($compare)));
+		}
+
+		/**
+		 *	  @deprecated
+		 */
+		function assertExpectation($expectation, $compare, $message = '%s') {
+			return $this->assert($expectation, $compare, $message);
+		}
+
+		/**
+		 *    Called from within the test methods to register
+		 *    passes and failures.
+		 *    @param boolean $result    Pass on true.
+		 *    @param string $message    Message to display describing
+		 *                              the test state.
+		 *    @return boolean           True on pass
+		 *    @access public
+		 */
+		function assertTrue($result, $message = false) {
+			if (! $message) {
+				$message = 'True assertion got ' . ($result ? 'True' : 'False');
+			}
+			if ($result) {
+				return $this->pass($message);
+			} else {
+				return $this->fail($message);
+			}
+		}
+
+		/**
+		 *    Will be true on false and vice versa. False
+		 *    is the PHP definition of false, so that null,
+		 *    empty strings, zero and an empty array all count
+		 *    as false.
+		 *    @param boolean $result    Pass on false.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True on pass
+		 *    @access public
+		 */
+		function assertFalse($result, $message = false) {
+			if (! $message) {
+				$message = 'False assertion got ' . ($result ? 'True' : 'False');
+			}
+			return $this->assertTrue(! $result, $message);
+		}
+
+		/**
+		 *    Uses a stack trace to find the line of an assertion.
+		 *    @param string $format    String formatting.
+		 *    @param array $stack      Stack frames top most first. Only
+		 *                             needed if not using the PHP
+		 *                             backtrace function.
+		 *    @return string           Line number of first assert*
+		 *                             method embedded in format string.
+		 *    @access public
+		 */
+		function getAssertionLine($stack = false) {
+			if ($stack === false) {
+				$stack = SimpleTestCompatibility::getStackTrace();
+			}
+			return SimpleDumper::getFormattedAssertionLine($stack);
+		}
+
+		/**
+		 *    Sends a formatted dump of a variable to the
+		 *    test suite for those emergency debugging
+		 *    situations.
+		 *    @param mixed $variable    Variable to display.
+		 *    @param string $message    Message to display.
+		 *    @return mixed             The original variable.
+		 *    @access public
+		 */
+		function dump($variable, $message = false) {
+			$formatted = SimpleDumper::dump($variable);
+			if ($message) {
+				$formatted = $message . "\n" . $formatted;
+			}
+			$this->_reporter->paintFormattedMessage($formatted);
+			return $variable;
+		}
+
+		/**
+		 *    Dispatches a text message straight to the
+		 *    test suite. Useful for status bar displays.
+		 *    @param string $message        Message to show.
+		 *    @access public
+		 */
+		function sendMessage($message) {
+			$this->_reporter->PaintMessage($message);
+		}
+
+		/**
+		 *    Accessor for the number of subtests.
+		 *    @return integer           Number of test cases.
+		 *    @access public
+		 *    @static
+		 */
+		static function getSize() {
+			return 1;
+		}
+	}
+
+	/**
+	 *    This is a composite test class for combining
+	 *    test cases and other RunnableTest classes into
+	 *    a group test.
 	 *    @package		SimpleTest
 	 *    @subpackage	UnitTester
-     */
-    class GroupTest {
-        protected $_label;
-        protected $_test_cases;
-        protected $_old_track_errors;
-        protected $_xdebug_is_enabled;
-
-        /**
-         *    Sets the name of the test suite.
-         *    @param string $label    Name sent at the start and end
-         *                            of the test.
-         *    @access public
-         */
-        function GroupTest($label = false) {
-            $this->_label = $label ? $label : get_class($this);
-            $this->_test_cases = array();
-            $this->_old_track_errors = ini_get('track_errors');
-            $this->_xdebug_is_enabled = function_exists('xdebug_is_enabled') ?
-                    xdebug_is_enabled() : false;
-        }
-
-        /**
-         *    Accessor for the test name for subclasses.
-         *    @return string           Name of the test.
-         *    @access public
-         */
-        function getLabel() {
-            return $this->_label;
-        }
+	 */
+	class GroupTest {
+		protected $_label;
+		protected $_test_cases;
+		protected $_old_track_errors;
+		protected $_xdebug_is_enabled;
+
+		/**
+		 *    Sets the name of the test suite.
+		 *    @param string $label    Name sent at the start and end
+		 *                            of the test.
+		 *    @access public
+		 */
+		function GroupTest($label = false) {
+			$this->_label = $label ? $label : get_class($this);
+			$this->_test_cases = array();
+			$this->_old_track_errors = ini_get('track_errors');
+			$this->_xdebug_is_enabled = function_exists('xdebug_is_enabled') ?
+					xdebug_is_enabled() : false;
+		}
+
+		/**
+		 *    Accessor for the test name for subclasses.
+		 *    @return string           Name of the test.
+		 *    @access public
+		 */
+		function getLabel() {
+			return $this->_label;
+		}
 
 		function setLabel($value)
 		{
 			$this->_label = $value;
 		}
 
-        /**
-         *    Adds a test into the suite. Can be either a group
-         *    test or some other unit test.
-         *    @param SimpleTestCase $test_case  Suite or individual test
-         *                                      case implementing the
-         *                                      runnable test interface.
-         *    @access public
-         */
-        function addTestCase($test_case) {
-            $this->_test_cases[] = $test_case;
-        }
-
-        /**
-         *    Adds a test into the suite by class name. The class will
-         *    be instantiated as needed.
-         *    @param SimpleTestCase $test_case  Suite or individual test
-         *                                      case implementing the
-         *                                      runnable test interface.
-         *    @access public
-         */
-        function addTestClass($class) {
-            if ($this->_getBaseTestCase($class) == 'grouptest') {
-                $this->_test_cases[] = new $class();
-            } else {
-                $this->_test_cases[] = $class;
-            }
-        }
-
-        /**
-         *    Builds a group test from a library of test cases.
-         *    The new group is composed into this one.
-         *    @param string $test_file        File name of library with
-         *                                    test case classes.
-         *    @access public
-         */
-        function addTestFile($test_file) {
-            $existing_classes = get_declared_classes();
-            if ($error = $this->_requireWithError($test_file)) {
-                $this->addTestCase(new BadGroupTest($test_file, $error));
-                return;
-            }
-            $classes = $this->_selectRunnableTests($existing_classes, get_declared_classes());
-            if (count($classes) == 0) {
-                $this->addTestCase(new BadGroupTest($test_file, "No runnable test cases in [$test_file]"));
-                return;
-            }
-            $group = $this->_createGroupFromClasses($test_file, $classes);
-            $this->addTestCase($group);
-        }
-
-        /**
-         *    Requires a source file recording any syntax errors.
-         *    @param string $file        File name to require in.
-         *    @return string/boolean     An error message on failure or false
-         *                               if no errors.
-         *    @access private
-         */
-        function _requireWithError($file) {
-            $this->_enableErrorReporting();
-            include_once($file);
-            $error = isset($php_errormsg) ? $php_errormsg : false;
-            $this->_disableErrorReporting();
-            $self_inflicted_errors = array(
-                    'Assigning the return value of new by reference is deprecated',
-                    'var: Deprecated. Please use the public/private/protected modifiers');
-            if (in_array($error, $self_inflicted_errors)) {
-                return false;
-            }
-            return $error;
-        }
-
-        /**
-         *    Sets up detection of parse errors. Note that XDebug
-         *    interferes with this and has to be disabled. This is
-         *    to make sure the correct error code is returned
-         *    from unattended scripts.
-         *    @access private
-         */
-        function _enableErrorReporting() {
-            if ($this->_xdebug_is_enabled) {
-                xdebug_disable();
-            }
-            ini_set('track_errors', true);
-        }
-
-        /**
-         *    Resets detection of parse errors to their old values.
-         *    This is to make sure the correct error code is returned
-         *    from unattended scripts.
-         *    @access private
-         */
-        function _disableErrorReporting() {
-            ini_set('track_errors', $this->_old_track_errors);
-            if ($this->_xdebug_is_enabled) {
-                xdebug_enable();
-            }
-        }
-
-        /**
-         *    Calculates the incoming test cases from a before
-         *    and after list of loaded classes. Skips abstract
-         *    classes.
-         *    @param array $existing_classes   Classes before require().
-         *    @param array $new_classes        Classes after require().
-         *    @return array                    New classes which are test
-         *                                     cases that shouldn't be ignored.
-         *    @access private
-         */
-        function _selectRunnableTests($existing_classes, $new_classes) {
-            $classes = array();
-            foreach ($new_classes as $class) {
-                if (in_array($class, $existing_classes)) {
-                    continue;
-                }
-                if ($this->_getBaseTestCase($class)) {
-                    $reflection = new SimpleReflection($class);
-                    if ($reflection->isAbstract()) {
-                        SimpleTest::ignore($class);
-                    }
-                    $classes[] = $class;
-                }
-            }
-            return $classes;
-        }
-
-        /**
-         *    Builds a group test from a class list.
-         *    @param string $title       Title of new group.
-         *    @param array $classes      Test classes.
-         *    @return GroupTest          Group loaded with the new
-         *                               test cases.
-         *    @access private
-         */
-        function &_createGroupFromClasses($title, $classes) {
-            SimpleTest::ignoreParentsIfIgnored($classes);
-            $group = new GroupTest($title);
-            foreach ($classes as $class) {
-                if (! SimpleTest::isIgnored($class)) {
-                    $group->addTestClass($class);
-                }
-            }
-            return $group;
-        }
-
-        /**
-         *    Test to see if a class is derived from the
-         *    SimpleTestCase class.
-         *    @param string $class     Class name.
-         *    @access private
-         */
-        function _getBaseTestCase($class) {
-            while ($class = get_parent_class($class)) {
-                $class = strtolower($class);
-                if ($class == "simpletestcase" || $class == "grouptest") {
-                    return $class;
-                }
-            }
-            return false;
-        }
-
-        /**
-         *    Delegates to a visiting collector to add test
-         *    files.
-         *    @param string $path                  Path to scan from.
-         *    @param SimpleCollector $collector    Directory scanner.
-         *    @access public
-         */
-        function collect($path, $collector) {
-            $collector->collect($this, $path);
-        }
-
-        /**
-         *    Invokes run() on all of the held test cases, instantiating
-         *    them if necessary.
-         *    @param SimpleReporter $reporter    Current test reporter.
-         *    @access public
-         */
-        function run($reporter) {
-            $reporter->paintGroupStart($this->getLabel(), $this->getSize());
-            for ($i = 0, $count = count($this->_test_cases); $i < $count; $i++) {
-                if (is_string($this->_test_cases[$i])) {
-                    $class = $this->_test_cases[$i];
-                    $test = new $class();
-                    $test->run($reporter);
-                } else {
-                    $this->_test_cases[$i]->run($reporter);
-                }
-            }
-            $reporter->paintGroupEnd($this->getLabel());
-            return $reporter->getStatus();
-        }
-
-        /**
-         *    Number of contained test cases.
-         *    @return integer     Total count of cases in the group.
-         *    @access public
-         */
-        function getSize() {
-            $count = 0;
-            foreach ($this->_test_cases as $case) {
-                if (is_string($case)) {
-                    $count++;
-                } else {
-                    $count += $case->getSize();
-                }
-            }
-            return $count;
-        }
-    }
-
-    /**
-     *    This is a failing group test for when a test suite hasn't
-     *    loaded properly.
+		/**
+		 *    Adds a test into the suite. Can be either a group
+		 *    test or some other unit test.
+		 *    @param SimpleTestCase $test_case  Suite or individual test
+		 *                                      case implementing the
+		 *                                      runnable test interface.
+		 *    @access public
+		 */
+		function addTestCase($test_case) {
+			$this->_test_cases[] = $test_case;
+		}
+
+		/**
+		 *    Adds a test into the suite by class name. The class will
+		 *    be instantiated as needed.
+		 *    @param SimpleTestCase $test_case  Suite or individual test
+		 *                                      case implementing the
+		 *                                      runnable test interface.
+		 *    @access public
+		 */
+		function addTestClass($class) {
+			if ($this->_getBaseTestCase($class) == 'grouptest') {
+				$this->_test_cases[] = new $class();
+			} else {
+				$this->_test_cases[] = $class;
+			}
+		}
+
+		/**
+		 *    Builds a group test from a library of test cases.
+		 *    The new group is composed into this one.
+		 *    @param string $test_file        File name of library with
+		 *                                    test case classes.
+		 *    @access public
+		 */
+		function addTestFile($test_file) {
+			$existing_classes = get_declared_classes();
+			if ($error = $this->_requireWithError($test_file)) {
+				$this->addTestCase(new BadGroupTest($test_file, $error));
+				return;
+			}
+			$classes = $this->_selectRunnableTests($existing_classes, get_declared_classes());
+			if (count($classes) == 0) {
+				$this->addTestCase(new BadGroupTest($test_file, "No runnable test cases in [$test_file]"));
+				return;
+			}
+			$group = $this->_createGroupFromClasses($test_file, $classes);
+			$this->addTestCase($group);
+		}
+
+		/**
+		 *    Requires a source file recording any syntax errors.
+		 *    @param string $file        File name to require in.
+		 *    @return string/boolean     An error message on failure or false
+		 *                               if no errors.
+		 *    @access private
+		 */
+		function _requireWithError($file) {
+			$this->_enableErrorReporting();
+			include_once($file);
+			$error = isset($php_errormsg) ? $php_errormsg : false;
+			$this->_disableErrorReporting();
+			$self_inflicted_errors = array(
+					'Assigning the return value of new by reference is deprecated',
+					'var: Deprecated. Please use the public/private/protected modifiers');
+			if (in_array($error, $self_inflicted_errors)) {
+				return false;
+			}
+			return $error;
+		}
+
+		/**
+		 *    Sets up detection of parse errors. Note that XDebug
+		 *    interferes with this and has to be disabled. This is
+		 *    to make sure the correct error code is returned
+		 *    from unattended scripts.
+		 *    @access private
+		 */
+		function _enableErrorReporting() {
+			if ($this->_xdebug_is_enabled) {
+				xdebug_disable();
+			}
+			ini_set('track_errors', true);
+		}
+
+		/**
+		 *    Resets detection of parse errors to their old values.
+		 *    This is to make sure the correct error code is returned
+		 *    from unattended scripts.
+		 *    @access private
+		 */
+		function _disableErrorReporting() {
+			ini_set('track_errors', $this->_old_track_errors);
+			if ($this->_xdebug_is_enabled) {
+				xdebug_enable();
+			}
+		}
+
+		/**
+		 *    Calculates the incoming test cases from a before
+		 *    and after list of loaded classes. Skips abstract
+		 *    classes.
+		 *    @param array $existing_classes   Classes before require().
+		 *    @param array $new_classes        Classes after require().
+		 *    @return array                    New classes which are test
+		 *                                     cases that shouldn't be ignored.
+		 *    @access private
+		 */
+		function _selectRunnableTests($existing_classes, $new_classes) {
+			$classes = array();
+			foreach ($new_classes as $class) {
+				if (in_array($class, $existing_classes)) {
+					continue;
+				}
+				if ($this->_getBaseTestCase($class)) {
+					$reflection = new SimpleReflection($class);
+					if ($reflection->isAbstract()) {
+						SimpleTest::ignore($class);
+					}
+					$classes[] = $class;
+				}
+			}
+			return $classes;
+		}
+
+		/**
+		 *    Builds a group test from a class list.
+		 *    @param string $title       Title of new group.
+		 *    @param array $classes      Test classes.
+		 *    @return GroupTest          Group loaded with the new
+		 *                               test cases.
+		 *    @access private
+		 */
+		function &_createGroupFromClasses($title, $classes) {
+			SimpleTest::ignoreParentsIfIgnored($classes);
+			$group = new GroupTest($title);
+			foreach ($classes as $class) {
+				if (! SimpleTest::isIgnored($class)) {
+					$group->addTestClass($class);
+				}
+			}
+			return $group;
+		}
+
+		/**
+		 *    Test to see if a class is derived from the
+		 *    SimpleTestCase class.
+		 *    @param string $class     Class name.
+		 *    @access private
+		 */
+		function _getBaseTestCase($class) {
+			while ($class = get_parent_class($class)) {
+				$class = strtolower($class);
+				if ($class == "simpletestcase" || $class == "grouptest") {
+					return $class;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 *    Delegates to a visiting collector to add test
+		 *    files.
+		 *    @param string $path                  Path to scan from.
+		 *    @param SimpleCollector $collector    Directory scanner.
+		 *    @access public
+		 */
+		function collect($path, $collector) {
+			$collector->collect($this, $path);
+		}
+
+		/**
+		 *    Invokes run() on all of the held test cases, instantiating
+		 *    them if necessary.
+		 *    @param SimpleReporter $reporter    Current test reporter.
+		 *    @access public
+		 */
+		function run($reporter) {
+			$reporter->paintGroupStart($this->getLabel(), $this->getSize());
+			for ($i = 0, $count = count($this->_test_cases); $i < $count; $i++) {
+				if (is_string($this->_test_cases[$i])) {
+					$class = $this->_test_cases[$i];
+					$test = new $class();
+					$test->run($reporter);
+				} else {
+					$this->_test_cases[$i]->run($reporter);
+				}
+			}
+			$reporter->paintGroupEnd($this->getLabel());
+			return $reporter->getStatus();
+		}
+
+		/**
+		 *    Number of contained test cases.
+		 *    @return integer     Total count of cases in the group.
+		 *    @access public
+		 */
+		function getSize() {
+			$count = 0;
+			foreach ($this->_test_cases as $case) {
+				if (is_string($case)) {
+					$count++;
+				} else {
+					$count += $case->getSize();
+				}
+			}
+			return $count;
+		}
+	}
+
+	/**
+	 *    This is a failing group test for when a test suite hasn't
+	 *    loaded properly.
 	 *    @package		SimpleTest
 	 *    @subpackage	UnitTester
-     */
-    class BadGroupTest {
-        protected $_label;
-        protected $_error;
-
-        /**
-         *    Sets the name of the test suite and error message.
-         *    @param string $label    Name sent at the start and end
-         *                            of the test.
-         *    @access public
-         */
-        function BadGroupTest($label, $error) {
-            $this->_label = $label;
-            $this->_error = $error;
-        }
-
-        /**
-         *    Accessor for the test name for subclasses.
-         *    @return string           Name of the test.
-         *    @access public
-         */
-        function getLabel() {
-            return $this->_label;
-        }
-
-        /**
-         *    Sends a single error to the reporter.
-         *    @param SimpleReporter $reporter    Current test reporter.
-         *    @access public
-         */
-        function run($reporter) {
-            $reporter->paintGroupStart($this->getLabel(), $this->getSize());
-            $reporter->paintFail('Bad GroupTest [' . $this->getLabel() .
-                    '] with error [' . $this->_error . ']');
-            $reporter->paintGroupEnd($this->getLabel());
-            return $reporter->getStatus();
-        }
-
-        /**
-         *    Number of contained test cases. Always zero.
-         *    @return integer     Total count of cases in the group.
-         *    @access public
-         */
-        function getSize() {
-            return 0;
-        }
-    }
+	 */
+	class BadGroupTest {
+		protected $_label;
+		protected $_error;
+
+		/**
+		 *    Sets the name of the test suite and error message.
+		 *    @param string $label    Name sent at the start and end
+		 *                            of the test.
+		 *    @access public
+		 */
+		function BadGroupTest($label, $error) {
+			$this->_label = $label;
+			$this->_error = $error;
+		}
+
+		/**
+		 *    Accessor for the test name for subclasses.
+		 *    @return string           Name of the test.
+		 *    @access public
+		 */
+		function getLabel() {
+			return $this->_label;
+		}
+
+		/**
+		 *    Sends a single error to the reporter.
+		 *    @param SimpleReporter $reporter    Current test reporter.
+		 *    @access public
+		 */
+		function run($reporter) {
+			$reporter->paintGroupStart($this->getLabel(), $this->getSize());
+			$reporter->paintFail('Bad GroupTest [' . $this->getLabel() .
+					'] with error [' . $this->_error . ']');
+			$reporter->paintGroupEnd($this->getLabel());
+			return $reporter->getStatus();
+		}
+
+		/**
+		 *    Number of contained test cases. Always zero.
+		 *    @return integer     Total count of cases in the group.
+		 *    @access public
+		 */
+		function getSize() {
+			return 0;
+		}
+	}

Spacing +13 added lines, -13 removed lines

@@ -23,7 +23,7 @@ 
     } else {
         require_once(dirname(__FILE__) . '/reflection_php4.php');
     }
-    if (! defined('SIMPLE_TEST')) {
+    if (!defined('SIMPLE_TEST')) {
         /**
          * @ignore
          */
@@ -130,7 +130,7 @@ 
          */
         function _isTest($method) {
             if (strtolower(substr($method, 0, 4)) == 'test') {
-                return ! SimpleTestCompatibility::isA($this, strtolower($method));
+                return !SimpleTestCompatibility::isA($this, strtolower($method));
             }
             return false;
         }
@@ -190,7 +190,7 @@ 
          *    @access public
          */
         function pass($message = "Pass") {
-            if (! isset($this->_reporter)) {
+            if (!isset($this->_reporter)) {
                 trigger_error('Can only make assertions within test methods');
             }
             $this->_reporter->paintPass(
@@ -204,7 +204,7 @@ 
          *    @access public
          */
         function fail($message = "Fail") {
-            if (! isset($this->_reporter)) {
+            if (!isset($this->_reporter)) {
                 trigger_error('Can only make assertions within test methods');
             }
             $this->_reporter->paintFail(
@@ -222,7 +222,7 @@ 
          *    @access public
          */
         function error($severity, $message, $file, $line) {
-            if (! isset($this->_reporter)) {
+            if (!isset($this->_reporter)) {
                 trigger_error('Can only make assertions within test methods');
             }
             $this->_reporter->paintError(
@@ -238,10 +238,10 @@ 
         function exception($exception) {
             $this->_reporter->paintError(
                     'Unexpected exception of type [' . get_class($exception) .
-                    '] with message ['. $exception->getMessage() .
-                    '] in ['. $exception->getFile() .
+                    '] with message [' . $exception->getMessage() .
+                    '] in [' . $exception->getFile() .
                     '] line [' . $exception->getLine() .
-					'] stack [' . $exception->getTraceAsString() .']');
+					'] stack [' . $exception->getTraceAsString() . ']');
         }
 
         /**
@@ -254,7 +254,7 @@ 
          *    @access public
          */
         function signal($type, $payload) {
-            if (! isset($this->_reporter)) {
+            if (!isset($this->_reporter)) {
                 trigger_error('Can only make assertions within test methods');
             }
             $this->_reporter->paintSignal($type, $payload);
@@ -301,7 +301,7 @@ 
          *    @access public
          */
         function assertTrue($result, $message = false) {
-            if (! $message) {
+            if (!$message) {
                 $message = 'True assertion got ' . ($result ? 'True' : 'False');
             }
             if ($result) {
@@ -322,10 +322,10 @@ 
          *    @access public
          */
         function assertFalse($result, $message = false) {
-            if (! $message) {
+            if (!$message) {
                 $message = 'False assertion got ' . ($result ? 'True' : 'False');
             }
-            return $this->assertTrue(! $result, $message);
+            return $this->assertTrue(!$result, $message);
         }
 
         /**
@@ -562,7 +562,7 @@ 
             SimpleTest::ignoreParentsIfIgnored($classes);
             $group = new GroupTest($title);
             foreach ($classes as $class) {
-                if (! SimpleTest::isIgnored($class)) {
+                if (!SimpleTest::isIgnored($class)) {
                     $group->addTestClass($class);
                 }
             }

tests/test_tools/simpletest/unit_tester.php

Doc Comments +2 added lines, -2 removed lines

@@ -185,7 +185,7 @@ 
         /**
          *    Will trigger a pass if the two parameters have
          *    the different value or different type.
-         *    @param mixed $first           Value to compare.
+         *    @param TActiveRecord $first           Value to compare.
          *    @param mixed $second          Value to compare.
          *    @param string $message        Message to display.
          *    @return boolean               True on pass
@@ -352,7 +352,7 @@ 
          *    Creates an equality expectation if the
          *    object/value is not already some type
          *    of expectation.
-         *    @param mixed $expected      Expected value.
+         *    @param string $expected      Expected value.
          *    @return SimpleExpectation   Expectation object.
          *    @access private
          */

Indentation +343 added lines, -343 removed lines

@@ -1,372 +1,372 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	UnitTester
-     *	@version	$Id: unit_tester.php 1398 2006-09-08 19:31:03Z xue $
-     */
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	UnitTester
+	 *	@version	$Id: unit_tester.php 1398 2006-09-08 19:31:03Z xue $
+	 */
 
-    /**#@+
+	/**#@+
      *	include other SimpleTest class files
      */
-    require_once(dirname(__FILE__) . '/test_case.php');
-    require_once(dirname(__FILE__) . '/dumper.php');
-    /**#@-*/
+	require_once(dirname(__FILE__) . '/test_case.php');
+	require_once(dirname(__FILE__) . '/dumper.php');
+	/**#@-*/
 
-    /**
-     *    Standard unit test class for day to day testing
-     *    of PHP code XP style. Adds some useful standard
-     *    assertions.
+	/**
+	 *    Standard unit test class for day to day testing
+	 *    of PHP code XP style. Adds some useful standard
+	 *    assertions.
 	 *	  @package	SimpleTest
 	 *	  @subpackage	UnitTester
-     */
-    class UnitTestCase extends SimpleTestCase {
+	 */
+	class UnitTestCase extends SimpleTestCase {
 
-        /**
-         *    Creates an empty test case. Should be subclassed
-         *    with test methods for a functional test case.
-         *    @param string $label     Name of test case. Will use
-         *                             the class name if none specified.
-         *    @access public
-         */
-        function UnitTestCase($label = false) {
-            if (! $label) {
-                $label = get_class($this);
-            }
-            $this->SimpleTestCase($label);
-        }
+		/**
+		 *    Creates an empty test case. Should be subclassed
+		 *    with test methods for a functional test case.
+		 *    @param string $label     Name of test case. Will use
+		 *                             the class name if none specified.
+		 *    @access public
+		 */
+		function UnitTestCase($label = false) {
+			if (! $label) {
+				$label = get_class($this);
+			}
+			$this->SimpleTestCase($label);
+		}
 
-        /**
-         *    Will be true if the value is null.
-         *    @param null $value       Supposedly null value.
-         *    @param string $message   Message to display.
-         *    @return boolean                        True on pass
-         *    @access public
-         */
-        function assertNull($value, $message = "%s") {
-            $dumper = new SimpleDumper();
-            $message = sprintf(
-                    $message,
-                    "[" . $dumper->describeValue($value) . "] should be null");
-            return $this->assertTrue(! isset($value), $message);
-        }
+		/**
+		 *    Will be true if the value is null.
+		 *    @param null $value       Supposedly null value.
+		 *    @param string $message   Message to display.
+		 *    @return boolean                        True on pass
+		 *    @access public
+		 */
+		function assertNull($value, $message = "%s") {
+			$dumper = new SimpleDumper();
+			$message = sprintf(
+					$message,
+					"[" . $dumper->describeValue($value) . "] should be null");
+			return $this->assertTrue(! isset($value), $message);
+		}
 
-        /**
-         *    Will be true if the value is set.
-         *    @param mixed $value           Supposedly set value.
-         *    @param string $message        Message to display.
-         *    @return boolean               True on pass.
-         *    @access public
-         */
-        function assertNotNull($value, $message = "%s") {
-            $dumper = new SimpleDumper();
-            $message = sprintf(
-                    $message,
-                    "[" . $dumper->describeValue($value) . "] should not be null");
-            return $this->assertTrue(isset($value), $message);
-        }
+		/**
+		 *    Will be true if the value is set.
+		 *    @param mixed $value           Supposedly set value.
+		 *    @param string $message        Message to display.
+		 *    @return boolean               True on pass.
+		 *    @access public
+		 */
+		function assertNotNull($value, $message = "%s") {
+			$dumper = new SimpleDumper();
+			$message = sprintf(
+					$message,
+					"[" . $dumper->describeValue($value) . "] should not be null");
+			return $this->assertTrue(isset($value), $message);
+		}
 
-        /**
-         *    Type and class test. Will pass if class
-         *    matches the type name or is a subclass or
-         *    if not an object, but the type is correct.
-         *    @param mixed $object         Object to test.
-         *    @param string $type          Type name as string.
-         *    @param string $message       Message to display.
-         *    @return boolean              True on pass.
-         *    @access public
-         */
-        function assertIsA($object, $type, $message = "%s") {
-            return $this->assert(
-                    new IsAExpectation($type),
-                    $object,
-                    $message);
-        }
+		/**
+		 *    Type and class test. Will pass if class
+		 *    matches the type name or is a subclass or
+		 *    if not an object, but the type is correct.
+		 *    @param mixed $object         Object to test.
+		 *    @param string $type          Type name as string.
+		 *    @param string $message       Message to display.
+		 *    @return boolean              True on pass.
+		 *    @access public
+		 */
+		function assertIsA($object, $type, $message = "%s") {
+			return $this->assert(
+					new IsAExpectation($type),
+					$object,
+					$message);
+		}
 
-        /**
-         *    Type and class mismatch test. Will pass if class
-         *    name or underling type does not match the one
-         *    specified.
-         *    @param mixed $object         Object to test.
-         *    @param string $type          Type name as string.
-         *    @param string $message       Message to display.
-         *    @return boolean              True on pass.
-         *    @access public
-         */
-        function assertNotA($object, $type, $message = "%s") {
-            return $this->assert(
-                    new NotAExpectation($type),
-                    $object,
-                    $message);
-        }
+		/**
+		 *    Type and class mismatch test. Will pass if class
+		 *    name or underling type does not match the one
+		 *    specified.
+		 *    @param mixed $object         Object to test.
+		 *    @param string $type          Type name as string.
+		 *    @param string $message       Message to display.
+		 *    @return boolean              True on pass.
+		 *    @access public
+		 */
+		function assertNotA($object, $type, $message = "%s") {
+			return $this->assert(
+					new NotAExpectation($type),
+					$object,
+					$message);
+		}
 
-        /**
-         *    Will trigger a pass if the two parameters have
-         *    the same value only. Otherwise a fail.
-         *    @param mixed $first          Value to compare.
-         *    @param mixed $second         Value to compare.
-         *    @param string $message       Message to display.
-         *    @return boolean              True on pass
-         *    @access public
-         */
-        function assertEqual($first, $second, $message = "%s") {
-            return $this->assert(
-                    new EqualExpectation($first),
-                    $second,
-                    $message);
-        }
+		/**
+		 *    Will trigger a pass if the two parameters have
+		 *    the same value only. Otherwise a fail.
+		 *    @param mixed $first          Value to compare.
+		 *    @param mixed $second         Value to compare.
+		 *    @param string $message       Message to display.
+		 *    @return boolean              True on pass
+		 *    @access public
+		 */
+		function assertEqual($first, $second, $message = "%s") {
+			return $this->assert(
+					new EqualExpectation($first),
+					$second,
+					$message);
+		}
 
-        /**
-         *    Will trigger a pass if the two parameters have
-         *    a different value. Otherwise a fail.
-         *    @param mixed $first           Value to compare.
-         *    @param mixed $second          Value to compare.
-         *    @param string $message        Message to display.
-         *    @return boolean               True on pass
-         *    @access public
-         */
-        function assertNotEqual($first, $second, $message = "%s") {
-            return $this->assert(
-                    new NotEqualExpectation($first),
-                    $second,
-                    $message);
-        }
+		/**
+		 *    Will trigger a pass if the two parameters have
+		 *    a different value. Otherwise a fail.
+		 *    @param mixed $first           Value to compare.
+		 *    @param mixed $second          Value to compare.
+		 *    @param string $message        Message to display.
+		 *    @return boolean               True on pass
+		 *    @access public
+		 */
+		function assertNotEqual($first, $second, $message = "%s") {
+			return $this->assert(
+					new NotEqualExpectation($first),
+					$second,
+					$message);
+		}
 
-        /**
-         *    Will trigger a pass if the if the first parameter
-         *    is near enough to the second by the margin.
-         *    @param mixed $first          Value to compare.
-         *    @param mixed $second         Value to compare.
-         *    @param mixed $margin         Fuzziness of match.
-         *    @param string $message       Message to display.
-         *    @return boolean              True on pass
-         *    @access public
-         */
-        function assertWithinMargin($first, $second, $margin, $message = "%s") {
-            return $this->assert(
-                    new WithinMarginExpectation($first, $margin),
-                    $second,
-                    $message);
-        }
+		/**
+		 *    Will trigger a pass if the if the first parameter
+		 *    is near enough to the second by the margin.
+		 *    @param mixed $first          Value to compare.
+		 *    @param mixed $second         Value to compare.
+		 *    @param mixed $margin         Fuzziness of match.
+		 *    @param string $message       Message to display.
+		 *    @return boolean              True on pass
+		 *    @access public
+		 */
+		function assertWithinMargin($first, $second, $margin, $message = "%s") {
+			return $this->assert(
+					new WithinMarginExpectation($first, $margin),
+					$second,
+					$message);
+		}
 
-        /**
-         *    Will trigger a pass if the two parameters differ
-         *    by more than the margin.
-         *    @param mixed $first          Value to compare.
-         *    @param mixed $second         Value to compare.
-         *    @param mixed $margin         Fuzziness of match.
-         *    @param string $message       Message to display.
-         *    @return boolean              True on pass
-         *    @access public
-         */
-        function assertOutsideMargin($first, $second, $margin, $message = "%s") {
-            return $this->assert(
-                    new OutsideMarginExpectation($first, $margin),
-                    $second,
-                    $message);
-        }
+		/**
+		 *    Will trigger a pass if the two parameters differ
+		 *    by more than the margin.
+		 *    @param mixed $first          Value to compare.
+		 *    @param mixed $second         Value to compare.
+		 *    @param mixed $margin         Fuzziness of match.
+		 *    @param string $message       Message to display.
+		 *    @return boolean              True on pass
+		 *    @access public
+		 */
+		function assertOutsideMargin($first, $second, $margin, $message = "%s") {
+			return $this->assert(
+					new OutsideMarginExpectation($first, $margin),
+					$second,
+					$message);
+		}
 
-        /**
-         *    Will trigger a pass if the two parameters have
-         *    the same value and same type. Otherwise a fail.
-         *    @param mixed $first           Value to compare.
-         *    @param mixed $second          Value to compare.
-         *    @param string $message        Message to display.
-         *    @return boolean               True on pass
-         *    @access public
-         */
-        function assertIdentical($first, $second, $message = "%s") {
-            return $this->assert(
-                    new IdenticalExpectation($first),
-                    $second,
-                    $message);
-        }
+		/**
+		 *    Will trigger a pass if the two parameters have
+		 *    the same value and same type. Otherwise a fail.
+		 *    @param mixed $first           Value to compare.
+		 *    @param mixed $second          Value to compare.
+		 *    @param string $message        Message to display.
+		 *    @return boolean               True on pass
+		 *    @access public
+		 */
+		function assertIdentical($first, $second, $message = "%s") {
+			return $this->assert(
+					new IdenticalExpectation($first),
+					$second,
+					$message);
+		}
 
-        /**
-         *    Will trigger a pass if the two parameters have
-         *    the different value or different type.
-         *    @param mixed $first           Value to compare.
-         *    @param mixed $second          Value to compare.
-         *    @param string $message        Message to display.
-         *    @return boolean               True on pass
-         *    @access public
-         */
-        function assertNotIdentical($first, $second, $message = "%s") {
-            return $this->assert(
-                    new NotIdenticalExpectation($first),
-                    $second,
-                    $message);
-        }
+		/**
+		 *    Will trigger a pass if the two parameters have
+		 *    the different value or different type.
+		 *    @param mixed $first           Value to compare.
+		 *    @param mixed $second          Value to compare.
+		 *    @param string $message        Message to display.
+		 *    @return boolean               True on pass
+		 *    @access public
+		 */
+		function assertNotIdentical($first, $second, $message = "%s") {
+			return $this->assert(
+					new NotIdenticalExpectation($first),
+					$second,
+					$message);
+		}
 
-        /**
-         *    Will trigger a pass if both parameters refer
-         *    to the same object. Fail otherwise.
-         *    @param mixed $first           Object reference to check.
-         *    @param mixed $second          Hopefully the same object.
-         *    @param string $message        Message to display.
-         *    @return boolean               True on pass
-         *    @access public
-         */
-        function assertReference($first, $second, $message = "%s") {
-            $dumper = new SimpleDumper();
-            $message = sprintf(
-                    $message,
-                    "[" . $dumper->describeValue($first) .
-                            "] and [" . $dumper->describeValue($second) .
-                            "] should reference the same object");
-            return $this->assertTrue(
-                    SimpleTestCompatibility::isReference($first, $second),
-                    $message);
-        }
+		/**
+		 *    Will trigger a pass if both parameters refer
+		 *    to the same object. Fail otherwise.
+		 *    @param mixed $first           Object reference to check.
+		 *    @param mixed $second          Hopefully the same object.
+		 *    @param string $message        Message to display.
+		 *    @return boolean               True on pass
+		 *    @access public
+		 */
+		function assertReference($first, $second, $message = "%s") {
+			$dumper = new SimpleDumper();
+			$message = sprintf(
+					$message,
+					"[" . $dumper->describeValue($first) .
+							"] and [" . $dumper->describeValue($second) .
+							"] should reference the same object");
+			return $this->assertTrue(
+					SimpleTestCompatibility::isReference($first, $second),
+					$message);
+		}
 
-        /**
-         *    Will trigger a pass if both parameters refer
-         *    to different objects. Fail otherwise. The objects
-         *    have to be identical though.
-         *    @param mixed $first           Object reference to check.
-         *    @param mixed $second          Hopefully not the same object.
-         *    @param string $message        Message to display.
-         *    @return boolean               True on pass
-         *    @access public
-         */
-        function assertClone($first, $second, $message = "%s") {
-            $dumper = new SimpleDumper();
-            $message = sprintf(
-                    $message,
-                    "[" . $dumper->describeValue($first) .
-                            "] and [" . $dumper->describeValue($second) .
-                            "] should not be the same object");
-            $identical = new IdenticalExpectation($first);
-            return $this->assertTrue(
-                    $identical->test($second) &&
-                            ! SimpleTestCompatibility::isReference($first, $second),
-                    $message);
-        }
+		/**
+		 *    Will trigger a pass if both parameters refer
+		 *    to different objects. Fail otherwise. The objects
+		 *    have to be identical though.
+		 *    @param mixed $first           Object reference to check.
+		 *    @param mixed $second          Hopefully not the same object.
+		 *    @param string $message        Message to display.
+		 *    @return boolean               True on pass
+		 *    @access public
+		 */
+		function assertClone($first, $second, $message = "%s") {
+			$dumper = new SimpleDumper();
+			$message = sprintf(
+					$message,
+					"[" . $dumper->describeValue($first) .
+							"] and [" . $dumper->describeValue($second) .
+							"] should not be the same object");
+			$identical = new IdenticalExpectation($first);
+			return $this->assertTrue(
+					$identical->test($second) &&
+							! SimpleTestCompatibility::isReference($first, $second),
+					$message);
+		}
 
-        /**
-         *    @deprecated
-         */
-        function assertCopy($first, $second, $message = "%s") {
-            $dumper = new SimpleDumper();
-            $message = sprintf(
-                    $message,
-                    "[" . $dumper->describeValue($first) .
-                            "] and [" . $dumper->describeValue($second) .
-                            "] should not be the same object");
-            return $this->assertFalse(
-                    SimpleTestCompatibility::isReference($first, $second),
-                    $message);
-        }
+		/**
+		 *    @deprecated
+		 */
+		function assertCopy($first, $second, $message = "%s") {
+			$dumper = new SimpleDumper();
+			$message = sprintf(
+					$message,
+					"[" . $dumper->describeValue($first) .
+							"] and [" . $dumper->describeValue($second) .
+							"] should not be the same object");
+			return $this->assertFalse(
+					SimpleTestCompatibility::isReference($first, $second),
+					$message);
+		}
 
-        /**
-         *    Will trigger a pass if the Perl regex pattern
-         *    is found in the subject. Fail otherwise.
-         *    @param string $pattern    Perl regex to look for including
-         *                              the regex delimiters.
-         *    @param string $subject    String to search in.
-         *    @param string $message    Message to display.
-         *    @return boolean           True on pass
-         *    @access public
-         */
-        function assertPattern($pattern, $subject, $message = "%s") {
-            return $this->assert(
-                    new PatternExpectation($pattern),
-                    $subject,
-                    $message);
-        }
+		/**
+		 *    Will trigger a pass if the Perl regex pattern
+		 *    is found in the subject. Fail otherwise.
+		 *    @param string $pattern    Perl regex to look for including
+		 *                              the regex delimiters.
+		 *    @param string $subject    String to search in.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True on pass
+		 *    @access public
+		 */
+		function assertPattern($pattern, $subject, $message = "%s") {
+			return $this->assert(
+					new PatternExpectation($pattern),
+					$subject,
+					$message);
+		}
 
-        /**
-         *	  @deprecated
-         */
-        function assertWantedPattern($pattern, $subject, $message = "%s") {
-        	return $this->assertPattern($pattern, $subject, $message);
-        }
+		/**
+		 *	  @deprecated
+		 */
+		function assertWantedPattern($pattern, $subject, $message = "%s") {
+			return $this->assertPattern($pattern, $subject, $message);
+		}
 
-        /**
-         *    Will trigger a pass if the perl regex pattern
-         *    is not present in subject. Fail if found.
-         *    @param string $pattern    Perl regex to look for including
-         *                              the regex delimiters.
-         *    @param string $subject    String to search in.
-         *    @param string $message    Message to display.
-         *    @return boolean           True on pass
-         *    @access public
-         */
-        function assertNoPattern($pattern, $subject, $message = "%s") {
-            return $this->assert(
-                    new NoPatternExpectation($pattern),
-                    $subject,
-                    $message);
-        }
+		/**
+		 *    Will trigger a pass if the perl regex pattern
+		 *    is not present in subject. Fail if found.
+		 *    @param string $pattern    Perl regex to look for including
+		 *                              the regex delimiters.
+		 *    @param string $subject    String to search in.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True on pass
+		 *    @access public
+		 */
+		function assertNoPattern($pattern, $subject, $message = "%s") {
+			return $this->assert(
+					new NoPatternExpectation($pattern),
+					$subject,
+					$message);
+		}
 
-        /**
-         *	  @deprecated
-         */
-        function assertNoUnwantedPattern($pattern, $subject, $message = "%s") {
-        	return $this->assertNoPattern($pattern, $subject, $message);
-        }
+		/**
+		 *	  @deprecated
+		 */
+		function assertNoUnwantedPattern($pattern, $subject, $message = "%s") {
+			return $this->assertNoPattern($pattern, $subject, $message);
+		}
 
-        /**
-         *    Confirms that no errors have occoured so
-         *    far in the test method.
-         *    @param string $message    Message to display.
-         *    @return boolean           True on pass
-         *    @access public
-         */
-        function assertNoErrors($message = "%s") {
-            $queue = &SimpleErrorQueue::instance();
-            return $this->assertTrue(
-                    $queue->isEmpty(),
-                    sprintf($message, "Should be no errors"));
-        }
+		/**
+		 *    Confirms that no errors have occoured so
+		 *    far in the test method.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True on pass
+		 *    @access public
+		 */
+		function assertNoErrors($message = "%s") {
+			$queue = &SimpleErrorQueue::instance();
+			return $this->assertTrue(
+					$queue->isEmpty(),
+					sprintf($message, "Should be no errors"));
+		}
 
-        /**
-         *    Confirms that an error has occoured and
-         *    optionally that the error text matches exactly.
-         *    @param string $expected   Expected error text or
-         *                              false for no check.
-         *    @param string $message    Message to display.
-         *    @return boolean           True on pass
-         *    @access public
-         */
-        function assertError($expected = false, $message = "%s") {
-            $queue = &SimpleErrorQueue::instance();
-            if ($queue->isEmpty()) {
-                $this->fail(sprintf($message, "Expected error not found"));
-                return;
-            }
-            list($severity, $content, $file, $line, $globals) = $queue->extract();
-            $severity = SimpleErrorQueue::getSeverityAsString($severity);
-            if (! $expected) {
-                return $this->pass(
-                        "Captured a PHP error of [$content] severity [$severity] in [$file] line [$line] -> %s");
-            }
-            $expected = $this->_coerceToExpectation($expected);
-            return $this->assert(
-                    $expected,
-                    $content,
-                    "Expected PHP error [$content] severity [$severity] in [$file] line [$line] -> %s");
-        }
+		/**
+		 *    Confirms that an error has occoured and
+		 *    optionally that the error text matches exactly.
+		 *    @param string $expected   Expected error text or
+		 *                              false for no check.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True on pass
+		 *    @access public
+		 */
+		function assertError($expected = false, $message = "%s") {
+			$queue = &SimpleErrorQueue::instance();
+			if ($queue->isEmpty()) {
+				$this->fail(sprintf($message, "Expected error not found"));
+				return;
+			}
+			list($severity, $content, $file, $line, $globals) = $queue->extract();
+			$severity = SimpleErrorQueue::getSeverityAsString($severity);
+			if (! $expected) {
+				return $this->pass(
+						"Captured a PHP error of [$content] severity [$severity] in [$file] line [$line] -> %s");
+			}
+			$expected = $this->_coerceToExpectation($expected);
+			return $this->assert(
+					$expected,
+					$content,
+					"Expected PHP error [$content] severity [$severity] in [$file] line [$line] -> %s");
+		}
 
-        /**
-         *    Creates an equality expectation if the
-         *    object/value is not already some type
-         *    of expectation.
-         *    @param mixed $expected      Expected value.
-         *    @return SimpleExpectation   Expectation object.
-         *    @access private
-         */
-        function _coerceToExpectation($expected) {
-            if (SimpleTestCompatibility::isA($expected, 'SimpleExpectation')) {
-                return $expected;
-            }
-            return new EqualExpectation($expected);
-        }
+		/**
+		 *    Creates an equality expectation if the
+		 *    object/value is not already some type
+		 *    of expectation.
+		 *    @param mixed $expected      Expected value.
+		 *    @return SimpleExpectation   Expectation object.
+		 *    @access private
+		 */
+		function _coerceToExpectation($expected) {
+			if (SimpleTestCompatibility::isA($expected, 'SimpleExpectation')) {
+				return $expected;
+			}
+			return new EqualExpectation($expected);
+		}
 
-        /**
-         *    @deprecated
-         */
-        function assertErrorPattern($pattern, $message = "%s") {
-            return $this->assertError(new PatternExpectation($pattern), $message);
-        }
-    }
+		/**
+		 *    @deprecated
+		 */
+		function assertErrorPattern($pattern, $message = "%s") {
+			return $this->assertError(new PatternExpectation($pattern), $message);
+		}
+	}

Spacing +4 added lines, -4 removed lines

@@ -30,7 +30,7 @@ 
          *    @access public
          */
         function UnitTestCase($label = false) {
-            if (! $label) {
+            if (!$label) {
                 $label = get_class($this);
             }
             $this->SimpleTestCase($label);
@@ -48,7 +48,7 @@ 
             $message = sprintf(
                     $message,
                     "[" . $dumper->describeValue($value) . "] should be null");
-            return $this->assertTrue(! isset($value), $message);
+            return $this->assertTrue(!isset($value), $message);
         }
 
         /**
@@ -239,7 +239,7 @@ 
             $identical = new IdenticalExpectation($first);
             return $this->assertTrue(
                     $identical->test($second) &&
-                            ! SimpleTestCompatibility::isReference($first, $second),
+                            !SimpleTestCompatibility::isReference($first, $second),
                     $message);
         }
 
@@ -337,7 +337,7 @@ 
             }
             list($severity, $content, $file, $line, $globals) = $queue->extract();
             $severity = SimpleErrorQueue::getSeverityAsString($severity);
-            if (! $expected) {
+            if (!$expected) {
                 return $this->pass(
                         "Captured a PHP error of [$content] severity [$severity] in [$file] line [$line] -> %s");
             }

tests/test_tools/simpletest/url.php

Doc Comments +4 added lines, -3 removed lines

@@ -178,7 +178,7 @@ 
         /**
          *    Breaks the request down into an object.
          *    @param string $raw           Raw request.
-         *    @return SimpleFormEncoding    Parsed data.
+         *    @return SimpleGetEncoding    Parsed data.
          *    @access private
          */
         function _parseRequest($raw) {
@@ -266,7 +266,7 @@ 
         /**
          *    Accessor for page if any. This may be a
          *    directory name if ambiguious.
-         *    @return            Page name.
+         *    @return            false|string name.
          *    @access public
          */
         function getPage() {
@@ -430,7 +430,7 @@ 
          *    Replaces unknown sections to turn a relative
          *    URL into an absolute one. The base URL can
          *    be either a string or a SimpleUrl object.
-         *    @param string/SimpleUrl $base       Base URL.
+         *    @param SimpleUrl $base       Base URL.
          *    @access public
          */
         function makeAbsolute($base) {
@@ -463,6 +463,7 @@ 
          *    @param string/SimpleUrl $base       Base URL.
          *    @param string                       Absolute path.
          *    @access private
+         * @return string
          */
         function _extractAbsolutePath($base) {
             if ($this->getHost()) {

Indentation +519 added lines, -519 removed lines

@@ -1,524 +1,524 @@
 <?php
-    /**
-     *	base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	WebTester
-     *	@version	$Id: url.php 1532 2006-12-01 12:28:55Z xue $
-     */
-
-    /**#@+
+	/**
+	 *	base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	WebTester
+	 *	@version	$Id: url.php 1532 2006-12-01 12:28:55Z xue $
+	 */
+
+	/**#@+
      *	include other SimpleTest class files
      */
-    require_once(dirname(__FILE__) . '/encoding.php');
-    /**#@-*/
-
-    /**
-     *    URL parser to replace parse_url() PHP function which
-     *    got broken in PHP 4.3.0. Adds some browser specific
-     *    functionality such as expandomatics.
-     *    Guesses a bit trying to separate the host from
-     *    the path and tries to keep a raw, possibly unparsable,
-     *    request string as long as possible.
+	require_once(dirname(__FILE__) . '/encoding.php');
+	/**#@-*/
+
+	/**
+	 *    URL parser to replace parse_url() PHP function which
+	 *    got broken in PHP 4.3.0. Adds some browser specific
+	 *    functionality such as expandomatics.
+	 *    Guesses a bit trying to separate the host from
+	 *    the path and tries to keep a raw, possibly unparsable,
+	 *    request string as long as possible.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleUrl {
-        protected $_scheme;
-        protected $_username;
-        protected $_password;
-        protected $_host;
-        protected $_port;
-        protected $_path;
-        protected $_request;
-        protected $_fragment;
-        protected $_x;
-        protected $_y;
-        protected $_target;
-        protected $_raw = false;
-
-        /**
-         *    Constructor. Parses URL into sections.
-         *    @param string $url        Incoming URL.
-         *    @access public
-         */
-        function SimpleUrl($url) {
-            list($x, $y) = $this->_chompCoordinates($url);
-            $this->setCoordinates($x, $y);
-            $this->_scheme = $this->_chompScheme($url);
-            list($this->_username, $this->_password) = $this->_chompLogin($url);
-            $this->_host = $this->_chompHost($url);
-            $this->_port = false;
-            if (preg_match('/(.*?):(.*)/', $this->_host, $host_parts)) {
-                $this->_host = $host_parts[1];
-                $this->_port = (integer)$host_parts[2];
-            }
-            $this->_path = $this->_chompPath($url);
-            $this->_request = $this->_parseRequest($this->_chompRequest($url));
-            $this->_fragment = (strncmp($url, "#", 1) == 0 ? substr($url, 1) : false);
-            $this->_target = false;
-        }
-
-        /**
-         *    Extracts the X, Y coordinate pair from an image map.
-         *    @param string $url   URL so far. The coordinates will be
-         *                         removed.
-         *    @return array        X, Y as a pair of integers.
-         *    @access private
-         */
-        function _chompCoordinates($url) {
-            if (preg_match('/(.*)\?(\d+),(\d+)$/', $url, $matches)) {
-                $url = $matches[1];
-                return array((integer)$matches[2], (integer)$matches[3]);
-            }
-            return array(false, false);
-        }
-
-        /**
-         *    Extracts the scheme part of an incoming URL.
-         *    @param string $url   URL so far. The scheme will be
-         *                         removed.
-         *    @return string       Scheme part or false.
-         *    @access private
-         */
-        function _chompScheme($url) {
-            if (preg_match('/(.*?):(\/\/)(.*)/', $url, $matches)) {
-                $url = $matches[2] . $matches[3];
-                return $matches[1];
-            }
-            return false;
-        }
-
-        /**
-         *    Extracts the username and password from the
-         *    incoming URL. The // prefix will be reattached
-         *    to the URL after the doublet is extracted.
-         *    @param string $url    URL so far. The username and
-         *                          password are removed.
-         *    @return array         Two item list of username and
-         *                          password. Will urldecode() them.
-         *    @access private
-         */
-        function _chompLogin($url) {
-            $prefix = '';
-            if (preg_match('/^(\/\/)(.*)/', $url, $matches)) {
-                $prefix = $matches[1];
-                $url = $matches[2];
-            }
-            if (preg_match('/(.*?)@(.*)/', $url, $matches)) {
-                $url = $prefix . $matches[2];
-                $parts = split(":", $matches[1]);
-                return array(
-                        urldecode($parts[0]),
-                        isset($parts[1]) ? urldecode($parts[1]) : false);
-            }
-            $url = $prefix . $url;
-            return array(false, false);
-        }
-
-        /**
-         *    Extracts the host part of an incoming URL.
-         *    Includes the port number part. Will extract
-         *    the host if it starts with // or it has
-         *    a top level domain or it has at least two
-         *    dots.
-         *    @param string $url    URL so far. The host will be
-         *                          removed.
-         *    @return string        Host part guess or false.
-         *    @access private
-         */
-        function _chompHost($url) {
-            if (preg_match('/^(\/\/)(.*?)(\/.*|\?.*|#.*|$)/', $url, $matches)) {
-                $url = $matches[3];
-                return $matches[2];
-            }
-            if (preg_match('/(.*?)(\.\.\/|\.\/|\/|\?|#|$)(.*)/', $url, $matches)) {
-                $tlds = SimpleUrl::getAllTopLevelDomains();
-                if (preg_match('/[a-z0-9\-]+\.(' . $tlds . ')/i', $matches[1])) {
-                    $url = $matches[2] . $matches[3];
-                    return $matches[1];
-                } elseif (preg_match('/[a-z0-9\-]+\.[a-z0-9\-]+\.[a-z0-9\-]+/i', $matches[1])) {
-                    $url = $matches[2] . $matches[3];
-                    return $matches[1];
-                }
-            }
-            return false;
-        }
-
-        /**
-         *    Extracts the path information from the incoming
-         *    URL. Strips this path from the URL.
-         *    @param string $url     URL so far. The host will be
-         *                           removed.
-         *    @return string         Path part or '/'.
-         *    @access private
-         */
-        function _chompPath($url) {
-            if (preg_match('/(.*?)(\?|#|$)(.*)/', $url, $matches)) {
-                $url = $matches[2] . $matches[3];
-                return ($matches[1] ? $matches[1] : '');
-            }
-            return '';
-        }
-
-        /**
-         *    Strips off the request data.
-         *    @param string $url  URL so far. The request will be
-         *                        removed.
-         *    @return string      Raw request part.
-         *    @access private
-         */
-        function _chompRequest($url) {
-            if (preg_match('/\?(.*?)(#|$)(.*)/', $url, $matches)) {
-                $url = $matches[2] . $matches[3];
-                return $matches[1];
-            }
-            return '';
-        }
-
-        /**
-         *    Breaks the request down into an object.
-         *    @param string $raw           Raw request.
-         *    @return SimpleFormEncoding    Parsed data.
-         *    @access private
-         */
-        function _parseRequest($raw) {
-            $this->_raw = $raw;
-            $request = new SimpleGetEncoding();
-            foreach (split("&", $raw) as $pair) {
-                if (preg_match('/(.*?)=(.*)/', $pair, $matches)) {
-                    $request->add($matches[1], urldecode($matches[2]));
-                } elseif ($pair) {
-                    $request->add($pair, '');
-                }
-            }
-            return $request;
-        }
-
-        /**
-         *    Accessor for protocol part.
-         *    @param string $default    Value to use if not present.
-         *    @return string            Scheme name, e.g "http".
-         *    @access public
-         */
-        function getScheme($default = false) {
-            return $this->_scheme ? $this->_scheme : $default;
-        }
-
-        /**
-         *    Accessor for user name.
-         *    @return string    Username preceding host.
-         *    @access public
-         */
-        function getUsername() {
-            return $this->_username;
-        }
-
-        /**
-         *    Accessor for password.
-         *    @return string    Password preceding host.
-         *    @access public
-         */
-        function getPassword() {
-            return $this->_password;
-        }
-
-        /**
-         *    Accessor for hostname and port.
-         *    @param string $default    Value to use if not present.
-         *    @return string            Hostname only.
-         *    @access public
-         */
-        function getHost($default = false) {
-            return $this->_host ? $this->_host : $default;
-        }
-
-        /**
-         *    Accessor for top level domain.
-         *    @return string       Last part of host.
-         *    @access public
-         */
-        function getTld() {
-            $path_parts = pathinfo($this->getHost());
-            return (isset($path_parts['extension']) ? $path_parts['extension'] : false);
-        }
-
-        /**
-         *    Accessor for port number.
-         *    @return integer    TCP/IP port number.
-         *    @access public
-         */
-        function getPort() {
-            return $this->_port;
-        }
-
-       /**
-         *    Accessor for path.
-         *    @return string    Full path including leading slash if implied.
-         *    @access public
-         */
-        function getPath() {
-            if (! $this->_path && $this->_host) {
-                return '/';
-            }
-            return $this->_path;
-        }
-
-        /**
-         *    Accessor for page if any. This may be a
-         *    directory name if ambiguious.
-         *    @return            Page name.
-         *    @access public
-         */
-        function getPage() {
-            if (! preg_match('/([^\/]*?)$/', $this->getPath(), $matches)) {
-                return false;
-            }
-            return $matches[1];
-        }
-
-        /**
-         *    Gets the path to the page.
-         *    @return string       Path less the page.
-         *    @access public
-         */
-        function getBasePath() {
-            if (! preg_match('/(.*\/)[^\/]*?$/', $this->getPath(), $matches)) {
-                return false;
-            }
-            return $matches[1];
-        }
-
-        /**
-         *    Accessor for fragment at end of URL after the "#".
-         *    @return string    Part after "#".
-         *    @access public
-         */
-        function getFragment() {
-            return $this->_fragment;
-        }
-
-        /**
-         *    Sets image coordinates. Set to false to clear
-         *    them.
-         *    @param integer $x    Horizontal position.
-         *    @param integer $y    Vertical position.
-         *    @access public
-         */
-        function setCoordinates($x = false, $y = false) {
-            if (($x === false) || ($y === false)) {
-                $this->_x = $this->_y = false;
-                return;
-            }
-            $this->_x = (integer)$x;
-            $this->_y = (integer)$y;
-        }
-
-        /**
-         *    Accessor for horizontal image coordinate.
-         *    @return integer        X value.
-         *    @access public
-         */
-        function getX() {
-            return $this->_x;
-        }
-
-        /**
-         *    Accessor for vertical image coordinate.
-         *    @return integer        Y value.
-         *    @access public
-         */
-        function getY() {
-            return $this->_y;
-        }
-
-        /**
-         *    Accessor for current request parameters
-         *    in URL string form. Will return teh original request
-         *    if at all possible even if it doesn't make much
-         *    sense.
-         *    @return string   Form is string "?a=1&b=2", etc.
-         *    @access public
-         */
-        function getEncodedRequest() {
-            if ($this->_raw) {
-                $encoded = $this->_raw;
-            } else {
-                $encoded = $this->_request->asUrlRequest();
-            }
-            if ($encoded) {
-                return '?' . preg_replace('/^\?/', '', $encoded);
-            }
-            return '';
-        }
-
-        /**
-         *    Adds an additional parameter to the request.
-         *    @param string $key            Name of parameter.
-         *    @param string $value          Value as string.
-         *    @access public
-         */
-        function addRequestParameter($key, $value) {
-            $this->_raw = false;
-            $this->_request->add($key, $value);
-        }
-
-        /**
-         *    Adds additional parameters to the request.
-         *    @param hash/SimpleFormEncoding $parameters   Additional
-         *                                                parameters.
-         *    @access public
-         */
-        function addRequestParameters($parameters) {
-            $this->_raw = false;
-            $this->_request->merge($parameters);
-        }
-
-        /**
-         *    Clears down all parameters.
-         *    @access public
-         */
-        function clearRequest() {
-            $this->_raw = false;
-            $this->_request = new SimpleGetEncoding();
-        }
-
-        /**
-         *    Gets the frame target if present. Although
-         *    not strictly part of the URL specification it
-         *    acts as similarily to the browser.
-         *    @return boolean/string    Frame name or false if none.
-         *    @access public
-         */
-        function getTarget() {
-            return $this->_target;
-        }
-
-        /**
-         *    Attaches a frame target.
-         *    @param string $frame        Name of frame.
-         *    @access public
-         */
-        function setTarget($frame) {
-            $this->_raw = false;
-            $this->_target = $frame;
-        }
-
-        /**
-         *    Renders the URL back into a string.
-         *    @return string        URL in canonical form.
-         *    @access public
-         */
-        function asString() {
-            $scheme = $identity = $host = $path = $encoded = $fragment = '';
-            if ($this->_username && $this->_password) {
-                $identity = $this->_username . ':' . $this->_password . '@';
-            }
-            if ($this->getHost()) {
-                $scheme = $this->getScheme() ? $this->getScheme() : 'http';
-                $host = $this->getHost();
-            }
-            if (substr($this->_path, 0, 1) == '/') {
-                $path = $this->normalisePath($this->_path);
-            }
-            $encoded = $this->getEncodedRequest();
-            $fragment = $this->getFragment() ? '#'. $this->getFragment() : '';
-            $coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
-            return "$scheme://$identity$host$path$encoded$fragment$coords";
-        }
-
-        /**
-         *    Replaces unknown sections to turn a relative
-         *    URL into an absolute one. The base URL can
-         *    be either a string or a SimpleUrl object.
-         *    @param string/SimpleUrl $base       Base URL.
-         *    @access public
-         */
-        function makeAbsolute($base) {
-            if (! is_object($base)) {
-                $base = new SimpleUrl($base);
-            }
-            $scheme = $this->getScheme() ? $this->getScheme() : $base->getScheme();
-            if ($this->getHost()) {
-                $host = $this->getHost();
-                $port = $this->getPort() ? ':' . $this->getPort() : '';
-                $identity = $this->getIdentity() ? $this->getIdentity() . '@' : '';
-                if (! $identity) {
-                    $identity = $base->getIdentity() ? $base->getIdentity() . '@' : '';
-                }
-            } else {
-                $host = $base->getHost();
-                $port = $base->getPort() ? ':' . $base->getPort() : '';
-                $identity = $base->getIdentity() ? $base->getIdentity() . '@' : '';
-            }
-            $path = $this->normalisePath($this->_extractAbsolutePath($base));
-            $encoded = $this->getEncodedRequest();
-            $fragment = $this->getFragment() ? '#'. $this->getFragment() : '';
-            $coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
-            return new SimpleUrl("$scheme://$identity$host$port$path$encoded$fragment$coords");
-        }
-
-        /**
-         *    Replaces unknown sections of the path with base parts
-         *    to return a complete absolute one.
-         *    @param string/SimpleUrl $base       Base URL.
-         *    @param string                       Absolute path.
-         *    @access private
-         */
-        function _extractAbsolutePath($base) {
-            if ($this->getHost()) {
-                return $this->_path;
-            }
-            if (! $this->_isRelativePath($this->_path)) {
-                return $this->_path;
-            }
-            if ($this->_path) {
-                return $base->getBasePath() . $this->_path;
-            }
-            return $base->getPath();
-        }
-
-        /**
-         *    Simple test to see if a path part is relative.
-         *    @param string $path        Path to test.
-         *    @return boolean            True if starts with a "/".
-         *    @access private
-         */
-        function _isRelativePath($path) {
-            return (substr($path, 0, 1) != '/');
-        }
-
-        /**
-         *    Extracts the username and password for use in rendering
-         *    a URL.
-         *    @return string/boolean    Form of username:password or false.
-         *    @access public
-         */
-        function getIdentity() {
-            if ($this->_username && $this->_password) {
-                return $this->_username . ':' . $this->_password;
-            }
-            return false;
-        }
-
-        /**
-         *    Replaces . and .. sections of the path.
-         *    @param string $path    Unoptimised path.
-         *    @return string         Path with dots removed if possible.
-         *    @access public
-         */
-        function normalisePath($path) {
-            $path = preg_replace('|/[^/]+/\.\./|', '/', $path);
-            return preg_replace('|/\./|', '/', $path);
-        }
-
-        /**
-         *    A pipe seperated list of all TLDs that result in two part
-         *    domain names.
-         *    @return string        Pipe separated list.
-         *    @access public
-         *    @static
-         */
-        static function getAllTopLevelDomains() {
-            return 'com|edu|net|org|gov|mil|int|biz|info|name|pro|aero|coop|museum';
-        }
-    }
\ No newline at end of file
+	 */
+	class SimpleUrl {
+		protected $_scheme;
+		protected $_username;
+		protected $_password;
+		protected $_host;
+		protected $_port;
+		protected $_path;
+		protected $_request;
+		protected $_fragment;
+		protected $_x;
+		protected $_y;
+		protected $_target;
+		protected $_raw = false;
+
+		/**
+		 *    Constructor. Parses URL into sections.
+		 *    @param string $url        Incoming URL.
+		 *    @access public
+		 */
+		function SimpleUrl($url) {
+			list($x, $y) = $this->_chompCoordinates($url);
+			$this->setCoordinates($x, $y);
+			$this->_scheme = $this->_chompScheme($url);
+			list($this->_username, $this->_password) = $this->_chompLogin($url);
+			$this->_host = $this->_chompHost($url);
+			$this->_port = false;
+			if (preg_match('/(.*?):(.*)/', $this->_host, $host_parts)) {
+				$this->_host = $host_parts[1];
+				$this->_port = (integer)$host_parts[2];
+			}
+			$this->_path = $this->_chompPath($url);
+			$this->_request = $this->_parseRequest($this->_chompRequest($url));
+			$this->_fragment = (strncmp($url, "#", 1) == 0 ? substr($url, 1) : false);
+			$this->_target = false;
+		}
+
+		/**
+		 *    Extracts the X, Y coordinate pair from an image map.
+		 *    @param string $url   URL so far. The coordinates will be
+		 *                         removed.
+		 *    @return array        X, Y as a pair of integers.
+		 *    @access private
+		 */
+		function _chompCoordinates($url) {
+			if (preg_match('/(.*)\?(\d+),(\d+)$/', $url, $matches)) {
+				$url = $matches[1];
+				return array((integer)$matches[2], (integer)$matches[3]);
+			}
+			return array(false, false);
+		}
+
+		/**
+		 *    Extracts the scheme part of an incoming URL.
+		 *    @param string $url   URL so far. The scheme will be
+		 *                         removed.
+		 *    @return string       Scheme part or false.
+		 *    @access private
+		 */
+		function _chompScheme($url) {
+			if (preg_match('/(.*?):(\/\/)(.*)/', $url, $matches)) {
+				$url = $matches[2] . $matches[3];
+				return $matches[1];
+			}
+			return false;
+		}
+
+		/**
+		 *    Extracts the username and password from the
+		 *    incoming URL. The // prefix will be reattached
+		 *    to the URL after the doublet is extracted.
+		 *    @param string $url    URL so far. The username and
+		 *                          password are removed.
+		 *    @return array         Two item list of username and
+		 *                          password. Will urldecode() them.
+		 *    @access private
+		 */
+		function _chompLogin($url) {
+			$prefix = '';
+			if (preg_match('/^(\/\/)(.*)/', $url, $matches)) {
+				$prefix = $matches[1];
+				$url = $matches[2];
+			}
+			if (preg_match('/(.*?)@(.*)/', $url, $matches)) {
+				$url = $prefix . $matches[2];
+				$parts = split(":", $matches[1]);
+				return array(
+						urldecode($parts[0]),
+						isset($parts[1]) ? urldecode($parts[1]) : false);
+			}
+			$url = $prefix . $url;
+			return array(false, false);
+		}
+
+		/**
+		 *    Extracts the host part of an incoming URL.
+		 *    Includes the port number part. Will extract
+		 *    the host if it starts with // or it has
+		 *    a top level domain or it has at least two
+		 *    dots.
+		 *    @param string $url    URL so far. The host will be
+		 *                          removed.
+		 *    @return string        Host part guess or false.
+		 *    @access private
+		 */
+		function _chompHost($url) {
+			if (preg_match('/^(\/\/)(.*?)(\/.*|\?.*|#.*|$)/', $url, $matches)) {
+				$url = $matches[3];
+				return $matches[2];
+			}
+			if (preg_match('/(.*?)(\.\.\/|\.\/|\/|\?|#|$)(.*)/', $url, $matches)) {
+				$tlds = SimpleUrl::getAllTopLevelDomains();
+				if (preg_match('/[a-z0-9\-]+\.(' . $tlds . ')/i', $matches[1])) {
+					$url = $matches[2] . $matches[3];
+					return $matches[1];
+				} elseif (preg_match('/[a-z0-9\-]+\.[a-z0-9\-]+\.[a-z0-9\-]+/i', $matches[1])) {
+					$url = $matches[2] . $matches[3];
+					return $matches[1];
+				}
+			}
+			return false;
+		}
+
+		/**
+		 *    Extracts the path information from the incoming
+		 *    URL. Strips this path from the URL.
+		 *    @param string $url     URL so far. The host will be
+		 *                           removed.
+		 *    @return string         Path part or '/'.
+		 *    @access private
+		 */
+		function _chompPath($url) {
+			if (preg_match('/(.*?)(\?|#|$)(.*)/', $url, $matches)) {
+				$url = $matches[2] . $matches[3];
+				return ($matches[1] ? $matches[1] : '');
+			}
+			return '';
+		}
+
+		/**
+		 *    Strips off the request data.
+		 *    @param string $url  URL so far. The request will be
+		 *                        removed.
+		 *    @return string      Raw request part.
+		 *    @access private
+		 */
+		function _chompRequest($url) {
+			if (preg_match('/\?(.*?)(#|$)(.*)/', $url, $matches)) {
+				$url = $matches[2] . $matches[3];
+				return $matches[1];
+			}
+			return '';
+		}
+
+		/**
+		 *    Breaks the request down into an object.
+		 *    @param string $raw           Raw request.
+		 *    @return SimpleFormEncoding    Parsed data.
+		 *    @access private
+		 */
+		function _parseRequest($raw) {
+			$this->_raw = $raw;
+			$request = new SimpleGetEncoding();
+			foreach (split("&", $raw) as $pair) {
+				if (preg_match('/(.*?)=(.*)/', $pair, $matches)) {
+					$request->add($matches[1], urldecode($matches[2]));
+				} elseif ($pair) {
+					$request->add($pair, '');
+				}
+			}
+			return $request;
+		}
+
+		/**
+		 *    Accessor for protocol part.
+		 *    @param string $default    Value to use if not present.
+		 *    @return string            Scheme name, e.g "http".
+		 *    @access public
+		 */
+		function getScheme($default = false) {
+			return $this->_scheme ? $this->_scheme : $default;
+		}
+
+		/**
+		 *    Accessor for user name.
+		 *    @return string    Username preceding host.
+		 *    @access public
+		 */
+		function getUsername() {
+			return $this->_username;
+		}
+
+		/**
+		 *    Accessor for password.
+		 *    @return string    Password preceding host.
+		 *    @access public
+		 */
+		function getPassword() {
+			return $this->_password;
+		}
+
+		/**
+		 *    Accessor for hostname and port.
+		 *    @param string $default    Value to use if not present.
+		 *    @return string            Hostname only.
+		 *    @access public
+		 */
+		function getHost($default = false) {
+			return $this->_host ? $this->_host : $default;
+		}
+
+		/**
+		 *    Accessor for top level domain.
+		 *    @return string       Last part of host.
+		 *    @access public
+		 */
+		function getTld() {
+			$path_parts = pathinfo($this->getHost());
+			return (isset($path_parts['extension']) ? $path_parts['extension'] : false);
+		}
+
+		/**
+		 *    Accessor for port number.
+		 *    @return integer    TCP/IP port number.
+		 *    @access public
+		 */
+		function getPort() {
+			return $this->_port;
+		}
+
+	   /**
+	    *    Accessor for path.
+	    *    @return string    Full path including leading slash if implied.
+	    *    @access public
+	    */
+		function getPath() {
+			if (! $this->_path && $this->_host) {
+				return '/';
+			}
+			return $this->_path;
+		}
+
+		/**
+		 *    Accessor for page if any. This may be a
+		 *    directory name if ambiguious.
+		 *    @return            Page name.
+		 *    @access public
+		 */
+		function getPage() {
+			if (! preg_match('/([^\/]*?)$/', $this->getPath(), $matches)) {
+				return false;
+			}
+			return $matches[1];
+		}
+
+		/**
+		 *    Gets the path to the page.
+		 *    @return string       Path less the page.
+		 *    @access public
+		 */
+		function getBasePath() {
+			if (! preg_match('/(.*\/)[^\/]*?$/', $this->getPath(), $matches)) {
+				return false;
+			}
+			return $matches[1];
+		}
+
+		/**
+		 *    Accessor for fragment at end of URL after the "#".
+		 *    @return string    Part after "#".
+		 *    @access public
+		 */
+		function getFragment() {
+			return $this->_fragment;
+		}
+
+		/**
+		 *    Sets image coordinates. Set to false to clear
+		 *    them.
+		 *    @param integer $x    Horizontal position.
+		 *    @param integer $y    Vertical position.
+		 *    @access public
+		 */
+		function setCoordinates($x = false, $y = false) {
+			if (($x === false) || ($y === false)) {
+				$this->_x = $this->_y = false;
+				return;
+			}
+			$this->_x = (integer)$x;
+			$this->_y = (integer)$y;
+		}
+
+		/**
+		 *    Accessor for horizontal image coordinate.
+		 *    @return integer        X value.
+		 *    @access public
+		 */
+		function getX() {
+			return $this->_x;
+		}
+
+		/**
+		 *    Accessor for vertical image coordinate.
+		 *    @return integer        Y value.
+		 *    @access public
+		 */
+		function getY() {
+			return $this->_y;
+		}
+
+		/**
+		 *    Accessor for current request parameters
+		 *    in URL string form. Will return teh original request
+		 *    if at all possible even if it doesn't make much
+		 *    sense.
+		 *    @return string   Form is string "?a=1&b=2", etc.
+		 *    @access public
+		 */
+		function getEncodedRequest() {
+			if ($this->_raw) {
+				$encoded = $this->_raw;
+			} else {
+				$encoded = $this->_request->asUrlRequest();
+			}
+			if ($encoded) {
+				return '?' . preg_replace('/^\?/', '', $encoded);
+			}
+			return '';
+		}
+
+		/**
+		 *    Adds an additional parameter to the request.
+		 *    @param string $key            Name of parameter.
+		 *    @param string $value          Value as string.
+		 *    @access public
+		 */
+		function addRequestParameter($key, $value) {
+			$this->_raw = false;
+			$this->_request->add($key, $value);
+		}
+
+		/**
+		 *    Adds additional parameters to the request.
+		 *    @param hash/SimpleFormEncoding $parameters   Additional
+		 *                                                parameters.
+		 *    @access public
+		 */
+		function addRequestParameters($parameters) {
+			$this->_raw = false;
+			$this->_request->merge($parameters);
+		}
+
+		/**
+		 *    Clears down all parameters.
+		 *    @access public
+		 */
+		function clearRequest() {
+			$this->_raw = false;
+			$this->_request = new SimpleGetEncoding();
+		}
+
+		/**
+		 *    Gets the frame target if present. Although
+		 *    not strictly part of the URL specification it
+		 *    acts as similarily to the browser.
+		 *    @return boolean/string    Frame name or false if none.
+		 *    @access public
+		 */
+		function getTarget() {
+			return $this->_target;
+		}
+
+		/**
+		 *    Attaches a frame target.
+		 *    @param string $frame        Name of frame.
+		 *    @access public
+		 */
+		function setTarget($frame) {
+			$this->_raw = false;
+			$this->_target = $frame;
+		}
+
+		/**
+		 *    Renders the URL back into a string.
+		 *    @return string        URL in canonical form.
+		 *    @access public
+		 */
+		function asString() {
+			$scheme = $identity = $host = $path = $encoded = $fragment = '';
+			if ($this->_username && $this->_password) {
+				$identity = $this->_username . ':' . $this->_password . '@';
+			}
+			if ($this->getHost()) {
+				$scheme = $this->getScheme() ? $this->getScheme() : 'http';
+				$host = $this->getHost();
+			}
+			if (substr($this->_path, 0, 1) == '/') {
+				$path = $this->normalisePath($this->_path);
+			}
+			$encoded = $this->getEncodedRequest();
+			$fragment = $this->getFragment() ? '#'. $this->getFragment() : '';
+			$coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
+			return "$scheme://$identity$host$path$encoded$fragment$coords";
+		}
+
+		/**
+		 *    Replaces unknown sections to turn a relative
+		 *    URL into an absolute one. The base URL can
+		 *    be either a string or a SimpleUrl object.
+		 *    @param string/SimpleUrl $base       Base URL.
+		 *    @access public
+		 */
+		function makeAbsolute($base) {
+			if (! is_object($base)) {
+				$base = new SimpleUrl($base);
+			}
+			$scheme = $this->getScheme() ? $this->getScheme() : $base->getScheme();
+			if ($this->getHost()) {
+				$host = $this->getHost();
+				$port = $this->getPort() ? ':' . $this->getPort() : '';
+				$identity = $this->getIdentity() ? $this->getIdentity() . '@' : '';
+				if (! $identity) {
+					$identity = $base->getIdentity() ? $base->getIdentity() . '@' : '';
+				}
+			} else {
+				$host = $base->getHost();
+				$port = $base->getPort() ? ':' . $base->getPort() : '';
+				$identity = $base->getIdentity() ? $base->getIdentity() . '@' : '';
+			}
+			$path = $this->normalisePath($this->_extractAbsolutePath($base));
+			$encoded = $this->getEncodedRequest();
+			$fragment = $this->getFragment() ? '#'. $this->getFragment() : '';
+			$coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
+			return new SimpleUrl("$scheme://$identity$host$port$path$encoded$fragment$coords");
+		}
+
+		/**
+		 *    Replaces unknown sections of the path with base parts
+		 *    to return a complete absolute one.
+		 *    @param string/SimpleUrl $base       Base URL.
+		 *    @param string                       Absolute path.
+		 *    @access private
+		 */
+		function _extractAbsolutePath($base) {
+			if ($this->getHost()) {
+				return $this->_path;
+			}
+			if (! $this->_isRelativePath($this->_path)) {
+				return $this->_path;
+			}
+			if ($this->_path) {
+				return $base->getBasePath() . $this->_path;
+			}
+			return $base->getPath();
+		}
+
+		/**
+		 *    Simple test to see if a path part is relative.
+		 *    @param string $path        Path to test.
+		 *    @return boolean            True if starts with a "/".
+		 *    @access private
+		 */
+		function _isRelativePath($path) {
+			return (substr($path, 0, 1) != '/');
+		}
+
+		/**
+		 *    Extracts the username and password for use in rendering
+		 *    a URL.
+		 *    @return string/boolean    Form of username:password or false.
+		 *    @access public
+		 */
+		function getIdentity() {
+			if ($this->_username && $this->_password) {
+				return $this->_username . ':' . $this->_password;
+			}
+			return false;
+		}
+
+		/**
+		 *    Replaces . and .. sections of the path.
+		 *    @param string $path    Unoptimised path.
+		 *    @return string         Path with dots removed if possible.
+		 *    @access public
+		 */
+		function normalisePath($path) {
+			$path = preg_replace('|/[^/]+/\.\./|', '/', $path);
+			return preg_replace('|/\./|', '/', $path);
+		}
+
+		/**
+		 *    A pipe seperated list of all TLDs that result in two part
+		 *    domain names.
+		 *    @return string        Pipe separated list.
+		 *    @access public
+		 *    @static
+		 */
+		static function getAllTopLevelDomains() {
+			return 'com|edu|net|org|gov|mil|int|biz|info|name|pro|aero|coop|museum';
+		}
+	}
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -50,7 +50,7 @@ 
             $this->_port = false;
             if (preg_match('/(.*?):(.*)/', $this->_host, $host_parts)) {
                 $this->_host = $host_parts[1];
-                $this->_port = (integer)$host_parts[2];
+                $this->_port = (integer) $host_parts[2];
             }
             $this->_path = $this->_chompPath($url);
             $this->_request = $this->_parseRequest($this->_chompRequest($url));
@@ -68,7 +68,7 @@ 
         function _chompCoordinates($url) {
             if (preg_match('/(.*)\?(\d+),(\d+)$/', $url, $matches)) {
                 $url = $matches[1];
-                return array((integer)$matches[2], (integer)$matches[3]);
+                return array((integer) $matches[2], (integer) $matches[3]);
             }
             return array(false, false);
         }
@@ -257,7 +257,7 @@ 
          *    @access public
          */
         function getPath() {
-            if (! $this->_path && $this->_host) {
+            if (!$this->_path && $this->_host) {
                 return '/';
             }
             return $this->_path;
@@ -270,7 +270,7 @@ 
          *    @access public
          */
         function getPage() {
-            if (! preg_match('/([^\/]*?)$/', $this->getPath(), $matches)) {
+            if (!preg_match('/([^\/]*?)$/', $this->getPath(), $matches)) {
                 return false;
             }
             return $matches[1];
@@ -282,7 +282,7 @@ 
          *    @access public
          */
         function getBasePath() {
-            if (! preg_match('/(.*\/)[^\/]*?$/', $this->getPath(), $matches)) {
+            if (!preg_match('/(.*\/)[^\/]*?$/', $this->getPath(), $matches)) {
                 return false;
             }
             return $matches[1];
@@ -309,8 +309,8 @@ 
                 $this->_x = $this->_y = false;
                 return;
             }
-            $this->_x = (integer)$x;
-            $this->_y = (integer)$y;
+            $this->_x = (integer) $x;
+            $this->_y = (integer) $y;
         }
 
         /**
@@ -421,7 +421,7 @@ 
                 $path = $this->normalisePath($this->_path);
             }
             $encoded = $this->getEncodedRequest();
-            $fragment = $this->getFragment() ? '#'. $this->getFragment() : '';
+            $fragment = $this->getFragment() ? '#' . $this->getFragment() : '';
             $coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
             return "$scheme://$identity$host$path$encoded$fragment$coords";
         }
@@ -434,7 +434,7 @@ 
          *    @access public
          */
         function makeAbsolute($base) {
-            if (! is_object($base)) {
+            if (!is_object($base)) {
                 $base = new SimpleUrl($base);
             }
             $scheme = $this->getScheme() ? $this->getScheme() : $base->getScheme();
@@ -442,7 +442,7 @@ 
                 $host = $this->getHost();
                 $port = $this->getPort() ? ':' . $this->getPort() : '';
                 $identity = $this->getIdentity() ? $this->getIdentity() . '@' : '';
-                if (! $identity) {
+                if (!$identity) {
                     $identity = $base->getIdentity() ? $base->getIdentity() . '@' : '';
                 }
             } else {
@@ -452,7 +452,7 @@ 
             }
             $path = $this->normalisePath($this->_extractAbsolutePath($base));
             $encoded = $this->getEncodedRequest();
-            $fragment = $this->getFragment() ? '#'. $this->getFragment() : '';
+            $fragment = $this->getFragment() ? '#' . $this->getFragment() : '';
             $coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
             return new SimpleUrl("$scheme://$identity$host$port$path$encoded$fragment$coords");
         }
@@ -468,7 +468,7 @@ 
             if ($this->getHost()) {
                 return $this->_path;
             }
-            if (! $this->_isRelativePath($this->_path)) {
+            if (!$this->_isRelativePath($this->_path)) {
                 return $this->_path;
             }
             if ($this->_path) {

tests/test_tools/simpletest/user_agent.php

Doc Comments +1 added lines, -4 removed lines

@@ -233,7 +233,7 @@ 
          *    Fetches the page until no longer redirected or
          *    until the redirect limit runs out.
          *    @param SimpleUrl $url                  Target to fetch.
-         *    @param SimpelFormEncoding $encoding    Additional parameters for request.
+         *    @param SimpleEncoding $encoding    Additional parameters for request.
          *    @return SimpleHttpResponse             Hopefully the target page.
          *    @access private
          */
@@ -291,9 +291,6 @@ 
         /**
          *    Builds the appropriate HTTP request object.
          *    @param SimpleUrl $url                  Target to fetch as url object.
-         *    @param SimpleFormEncoding $parameters  POST/GET parameters.
-         *    @return SimpleHttpRequest              New request object.
-         *    @access protected
          */
         function &_createHttpRequest($url, $encoding) {
             $request = new SimpleHttpRequest($this->_createRoute($url), $encoding);

Indentation +302 added lines, -302 removed lines

@@ -1,332 +1,332 @@
 <?php
-    /**
-     *	Base include file for SimpleTest
-     *	@package	SimpleTest
-     *	@subpackage	WebTester
-     *	@version	$Id: user_agent.php 1398 2006-09-08 19:31:03Z xue $
-     */
+	/**
+	 *	Base include file for SimpleTest
+	 *	@package	SimpleTest
+	 *	@subpackage	WebTester
+	 *	@version	$Id: user_agent.php 1398 2006-09-08 19:31:03Z xue $
+	 */
 
-    /**#@+
+	/**#@+
      *	include other SimpleTest class files
      */
-    require_once(dirname(__FILE__) . '/cookies.php');
-    require_once(dirname(__FILE__) . '/http.php');
-    require_once(dirname(__FILE__) . '/encoding.php');
-    require_once(dirname(__FILE__) . '/authentication.php');
-    /**#@-*/
+	require_once(dirname(__FILE__) . '/cookies.php');
+	require_once(dirname(__FILE__) . '/http.php');
+	require_once(dirname(__FILE__) . '/encoding.php');
+	require_once(dirname(__FILE__) . '/authentication.php');
+	/**#@-*/
 
-    if (! defined('DEFAULT_MAX_REDIRECTS')) {
-        define('DEFAULT_MAX_REDIRECTS', 3);
-    }
+	if (! defined('DEFAULT_MAX_REDIRECTS')) {
+		define('DEFAULT_MAX_REDIRECTS', 3);
+	}
 
-    if (! defined('DEFAULT_CONNECTION_TIMEOUT')) {
-        define('DEFAULT_CONNECTION_TIMEOUT', 15);
-    }
+	if (! defined('DEFAULT_CONNECTION_TIMEOUT')) {
+		define('DEFAULT_CONNECTION_TIMEOUT', 15);
+	}
 
-    /**
-     *    Fetches web pages whilst keeping track of
-     *    cookies and authentication.
+	/**
+	 *    Fetches web pages whilst keeping track of
+	 *    cookies and authentication.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class SimpleUserAgent {
-        protected $_cookie_jar;
-        protected $_cookies_enabled = true;
-        protected $_authenticator;
-        protected $_max_redirects = DEFAULT_MAX_REDIRECTS;
-        protected $_proxy = false;
-        protected $_proxy_username = false;
-        protected $_proxy_password = false;
-        protected $_connection_timeout = DEFAULT_CONNECTION_TIMEOUT;
-        protected $_additional_headers = array();
+	 */
+	class SimpleUserAgent {
+		protected $_cookie_jar;
+		protected $_cookies_enabled = true;
+		protected $_authenticator;
+		protected $_max_redirects = DEFAULT_MAX_REDIRECTS;
+		protected $_proxy = false;
+		protected $_proxy_username = false;
+		protected $_proxy_password = false;
+		protected $_connection_timeout = DEFAULT_CONNECTION_TIMEOUT;
+		protected $_additional_headers = array();
 
-        /**
-         *    Starts with no cookies, realms or proxies.
-         *    @access public
-         */
-        function SimpleUserAgent() {
-            $this->_cookie_jar = new SimpleCookieJar();
-            $this->_authenticator = new SimpleAuthenticator();
-        }
+		/**
+		 *    Starts with no cookies, realms or proxies.
+		 *    @access public
+		 */
+		function SimpleUserAgent() {
+			$this->_cookie_jar = new SimpleCookieJar();
+			$this->_authenticator = new SimpleAuthenticator();
+		}
 
-        /**
-         *    Removes expired and temporary cookies as if
-         *    the browser was closed and re-opened. Authorisation
-         *    has to be obtained again as well.
-         *    @param string/integer $date   Time when session restarted.
-         *                                  If omitted then all persistent
-         *                                  cookies are kept.
-         *    @access public
-         */
-        function restart($date = false) {
-            $this->_cookie_jar->restartSession($date);
-            $this->_authenticator->restartSession();
-        }
+		/**
+		 *    Removes expired and temporary cookies as if
+		 *    the browser was closed and re-opened. Authorisation
+		 *    has to be obtained again as well.
+		 *    @param string/integer $date   Time when session restarted.
+		 *                                  If omitted then all persistent
+		 *                                  cookies are kept.
+		 *    @access public
+		 */
+		function restart($date = false) {
+			$this->_cookie_jar->restartSession($date);
+			$this->_authenticator->restartSession();
+		}
 
-        /**
-         *    Adds a header to every fetch.
-         *    @param string $header       Header line to add to every
-         *                                request until cleared.
-         *    @access public
-         */
-        function addHeader($header) {
-            $this->_additional_headers[] = $header;
-        }
+		/**
+		 *    Adds a header to every fetch.
+		 *    @param string $header       Header line to add to every
+		 *                                request until cleared.
+		 *    @access public
+		 */
+		function addHeader($header) {
+			$this->_additional_headers[] = $header;
+		}
 
-        /**
-         *    Ages the cookies by the specified time.
-         *    @param integer $interval    Amount in seconds.
-         *    @access public
-         */
-        function ageCookies($interval) {
-            $this->_cookie_jar->agePrematurely($interval);
-        }
+		/**
+		 *    Ages the cookies by the specified time.
+		 *    @param integer $interval    Amount in seconds.
+		 *    @access public
+		 */
+		function ageCookies($interval) {
+			$this->_cookie_jar->agePrematurely($interval);
+		}
 
-        /**
-         *    Sets an additional cookie. If a cookie has
-         *    the same name and path it is replaced.
-         *    @param string $name            Cookie key.
-         *    @param string $value           Value of cookie.
-         *    @param string $host            Host upon which the cookie is valid.
-         *    @param string $path            Cookie path if not host wide.
-         *    @param string $expiry          Expiry date.
-         *    @access public
-         */
-        function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
-            $this->_cookie_jar->setCookie($name, $value, $host, $path, $expiry);
-        }
+		/**
+		 *    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->_cookie_jar->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->_cookie_jar->getCookieValue($host, $path, $name);
-        }
+		/**
+		 *    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->_cookie_jar->getCookieValue($host, $path, $name);
+		}
 
-        /**
-         *    Reads the current cookies within the base URL.
-         *    @param string $name     Key of cookie to find.
-         *    @param SimpleUrl $base  Base URL to search from.
-         *    @return string/boolean  Null if there is no base URL, false
-         *                            if the cookie is not set.
-         *    @access public
-         */
-        function getBaseCookieValue($name, $base) {
-            if (! $base) {
-                return null;
-            }
-            return $this->getCookieValue($base->getHost(), $base->getPath(), $name);
-        }
+		/**
+		 *    Reads the current cookies within the base URL.
+		 *    @param string $name     Key of cookie to find.
+		 *    @param SimpleUrl $base  Base URL to search from.
+		 *    @return string/boolean  Null if there is no base URL, false
+		 *                            if the cookie is not set.
+		 *    @access public
+		 */
+		function getBaseCookieValue($name, $base) {
+			if (! $base) {
+				return null;
+			}
+			return $this->getCookieValue($base->getHost(), $base->getPath(), $name);
+		}
 
-        /**
-         *    Switches off cookie sending and recieving.
-         *    @access public
-         */
-        function ignoreCookies() {
-            $this->_cookies_enabled = false;
-        }
+		/**
+		 *    Switches off cookie sending and recieving.
+		 *    @access public
+		 */
+		function ignoreCookies() {
+			$this->_cookies_enabled = false;
+		}
 
-        /**
-         *    Switches back on the cookie sending and recieving.
-         *    @access public
-         */
-        function useCookies() {
-            $this->_cookies_enabled = true;
-        }
+		/**
+		 *    Switches back on the cookie sending and recieving.
+		 *    @access public
+		 */
+		function useCookies() {
+			$this->_cookies_enabled = true;
+		}
 
-        /**
-         *    Sets the socket timeout for opening a connection.
-         *    @param integer $timeout      Maximum time in seconds.
-         *    @access public
-         */
-        function setConnectionTimeout($timeout) {
-            $this->_connection_timeout = $timeout;
-        }
+		/**
+		 *    Sets the socket timeout for opening a connection.
+		 *    @param integer $timeout      Maximum time in seconds.
+		 *    @access public
+		 */
+		function setConnectionTimeout($timeout) {
+			$this->_connection_timeout = $timeout;
+		}
 
-        /**
-         *    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->_max_redirects = $max;
-        }
+		/**
+		 *    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->_max_redirects = $max;
+		}
 
-        /**
-         *    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, $password) {
-            if (! $proxy) {
-                $this->_proxy = false;
-                return;
-            }
-            if ((strncmp($proxy, 'http://', 7) != 0) && (strncmp($proxy, 'https://', 8) != 0)) {
-                $proxy = 'http://'. $proxy;
-            }
-            $this->_proxy = new SimpleUrl($proxy);
-            $this->_proxy_username = $username;
-            $this->_proxy_password = $password;
-        }
+		/**
+		 *    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, $password) {
+			if (! $proxy) {
+				$this->_proxy = false;
+				return;
+			}
+			if ((strncmp($proxy, 'http://', 7) != 0) && (strncmp($proxy, 'https://', 8) != 0)) {
+				$proxy = 'http://'. $proxy;
+			}
+			$this->_proxy = new SimpleUrl($proxy);
+			$this->_proxy_username = $username;
+			$this->_proxy_password = $password;
+		}
 
-        /**
-         *    Test to see if the redirect limit is passed.
-         *    @param integer $redirects        Count so far.
-         *    @return boolean                  True if over.
-         *    @access private
-         */
-        function _isTooManyRedirects($redirects) {
-            return ($redirects > $this->_max_redirects);
-        }
+		/**
+		 *    Test to see if the redirect limit is passed.
+		 *    @param integer $redirects        Count so far.
+		 *    @return boolean                  True if over.
+		 *    @access private
+		 */
+		function _isTooManyRedirects($redirects) {
+			return ($redirects > $this->_max_redirects);
+		}
 
-        /**
-         *    Sets the identity for the current realm.
-         *    @param string $host        Host to which realm applies.
-         *    @param string $realm       Full name of realm.
-         *    @param string $username    Username for realm.
-         *    @param string $password    Password for realm.
-         *    @access public
-         */
-        function setIdentity($host, $realm, $username, $password) {
-            $this->_authenticator->setIdentityForRealm($host, $realm, $username, $password);
-        }
+		/**
+		 *    Sets the identity for the current realm.
+		 *    @param string $host        Host to which realm applies.
+		 *    @param string $realm       Full name of realm.
+		 *    @param string $username    Username for realm.
+		 *    @param string $password    Password for realm.
+		 *    @access public
+		 */
+		function setIdentity($host, $realm, $username, $password) {
+			$this->_authenticator->setIdentityForRealm($host, $realm, $username, $password);
+		}
 
-        /**
-         *    Fetches a URL as a response object. Will keep trying if redirected.
-         *    It will also collect authentication realm information.
-         *    @param string/SimpleUrl $url      Target to fetch.
-         *    @param SimpleEncoding $encoding   Additional parameters for request.
-         *    @return SimpleHttpResponse        Hopefully the target page.
-         *    @access public
-         */
-        function &fetchResponse($url, $encoding) {
-            if ($encoding->getMethod() != 'POST') {
-                $url->addRequestParameters($encoding);
-                $encoding->clear();
-            }
-            $response = $this->_fetchWhileRedirected($url, $encoding);
-            if ($headers = $response->getHeaders()) {
-                if ($headers->isChallenge()) {
-                    $this->_authenticator->addRealm(
-                            $url,
-                            $headers->getAuthentication(),
-                            $headers->getRealm());
-                }
-            }
-            return $response;
-        }
+		/**
+		 *    Fetches a URL as a response object. Will keep trying if redirected.
+		 *    It will also collect authentication realm information.
+		 *    @param string/SimpleUrl $url      Target to fetch.
+		 *    @param SimpleEncoding $encoding   Additional parameters for request.
+		 *    @return SimpleHttpResponse        Hopefully the target page.
+		 *    @access public
+		 */
+		function &fetchResponse($url, $encoding) {
+			if ($encoding->getMethod() != 'POST') {
+				$url->addRequestParameters($encoding);
+				$encoding->clear();
+			}
+			$response = $this->_fetchWhileRedirected($url, $encoding);
+			if ($headers = $response->getHeaders()) {
+				if ($headers->isChallenge()) {
+					$this->_authenticator->addRealm(
+							$url,
+							$headers->getAuthentication(),
+							$headers->getRealm());
+				}
+			}
+			return $response;
+		}
 
-        /**
-         *    Fetches the page until no longer redirected or
-         *    until the redirect limit runs out.
-         *    @param SimpleUrl $url                  Target to fetch.
-         *    @param SimpelFormEncoding $encoding    Additional parameters for request.
-         *    @return SimpleHttpResponse             Hopefully the target page.
-         *    @access private
-         */
-        function &_fetchWhileRedirected($url, $encoding) {
-            $redirects = 0;
-            do {
-                $response = $this->_fetch($url, $encoding);
-                if ($response->isError()) {
-                    return $response;
-                }
-                $headers = $response->getHeaders();
-                $location = new SimpleUrl($headers->getLocation());
-                $url = $location->makeAbsolute($url);
-                if ($this->_cookies_enabled) {
-                    $headers->writeCookiesToJar($this->_cookie_jar, $url);
-                }
-                if (! $headers->isRedirect()) {
-                    break;
-                }
-                $encoding = new SimpleGetEncoding();
-            } while (! $this->_isTooManyRedirects(++$redirects));
-            return $response;
-        }
+		/**
+		 *    Fetches the page until no longer redirected or
+		 *    until the redirect limit runs out.
+		 *    @param SimpleUrl $url                  Target to fetch.
+		 *    @param SimpelFormEncoding $encoding    Additional parameters for request.
+		 *    @return SimpleHttpResponse             Hopefully the target page.
+		 *    @access private
+		 */
+		function &_fetchWhileRedirected($url, $encoding) {
+			$redirects = 0;
+			do {
+				$response = $this->_fetch($url, $encoding);
+				if ($response->isError()) {
+					return $response;
+				}
+				$headers = $response->getHeaders();
+				$location = new SimpleUrl($headers->getLocation());
+				$url = $location->makeAbsolute($url);
+				if ($this->_cookies_enabled) {
+					$headers->writeCookiesToJar($this->_cookie_jar, $url);
+				}
+				if (! $headers->isRedirect()) {
+					break;
+				}
+				$encoding = new SimpleGetEncoding();
+			} while (! $this->_isTooManyRedirects(++$redirects));
+			return $response;
+		}
 
-        /**
-         *    Actually make the web request.
-         *    @param SimpleUrl $url                   Target to fetch.
-         *    @param SimpleFormEncoding $encoding     Additional parameters for request.
-         *    @return SimpleHttpResponse              Headers and hopefully content.
-         *    @access protected
-         */
-        function &_fetch($url, $encoding) {
-            $request = $this->_createRequest($url, $encoding);
-            $response = $request->fetch($this->_connection_timeout);
-            return $response;
-        }
+		/**
+		 *    Actually make the web request.
+		 *    @param SimpleUrl $url                   Target to fetch.
+		 *    @param SimpleFormEncoding $encoding     Additional parameters for request.
+		 *    @return SimpleHttpResponse              Headers and hopefully content.
+		 *    @access protected
+		 */
+		function &_fetch($url, $encoding) {
+			$request = $this->_createRequest($url, $encoding);
+			$response = $request->fetch($this->_connection_timeout);
+			return $response;
+		}
 
-        /**
-         *    Creates a full page request.
-         *    @param SimpleUrl $url                 Target to fetch as url object.
-         *    @param SimpleFormEncoding $encoding   POST/GET parameters.
-         *    @return SimpleHttpRequest             New request.
-         *    @access private
-         */
-        function &_createRequest($url, $encoding) {
-            $request = $this->_createHttpRequest($url, $encoding);
-            $this->_addAdditionalHeaders($request);
-            if ($this->_cookies_enabled) {
-                $request->readCookiesFromJar($this->_cookie_jar, $url);
-            }
-            $this->_authenticator->addHeaders($request, $url);
-            return $request;
-        }
+		/**
+		 *    Creates a full page request.
+		 *    @param SimpleUrl $url                 Target to fetch as url object.
+		 *    @param SimpleFormEncoding $encoding   POST/GET parameters.
+		 *    @return SimpleHttpRequest             New request.
+		 *    @access private
+		 */
+		function &_createRequest($url, $encoding) {
+			$request = $this->_createHttpRequest($url, $encoding);
+			$this->_addAdditionalHeaders($request);
+			if ($this->_cookies_enabled) {
+				$request->readCookiesFromJar($this->_cookie_jar, $url);
+			}
+			$this->_authenticator->addHeaders($request, $url);
+			return $request;
+		}
 
-        /**
-         *    Builds the appropriate HTTP request object.
-         *    @param SimpleUrl $url                  Target to fetch as url object.
-         *    @param SimpleFormEncoding $parameters  POST/GET parameters.
-         *    @return SimpleHttpRequest              New request object.
-         *    @access protected
-         */
-        function &_createHttpRequest($url, $encoding) {
-            $request = new SimpleHttpRequest($this->_createRoute($url), $encoding);
-            return $request;
-        }
+		/**
+		 *    Builds the appropriate HTTP request object.
+		 *    @param SimpleUrl $url                  Target to fetch as url object.
+		 *    @param SimpleFormEncoding $parameters  POST/GET parameters.
+		 *    @return SimpleHttpRequest              New request object.
+		 *    @access protected
+		 */
+		function &_createHttpRequest($url, $encoding) {
+			$request = new SimpleHttpRequest($this->_createRoute($url), $encoding);
+			return $request;
+		}
 
-        /**
-         *    Sets up either a direct route or via a proxy.
-         *    @param SimpleUrl $url   Target to fetch as url object.
-         *    @return SimpleRoute     Route to take to fetch URL.
-         *    @access protected
-         */
-        function &_createRoute($url) {
-            if ($this->_proxy) {
-                $route = new SimpleProxyRoute(
-                        $url,
-                        $this->_proxy,
-                        $this->_proxy_username,
-                        $this->_proxy_password);
-            } else {
-                $route = new SimpleRoute($url);
-            }
-            return $route;
-        }
+		/**
+		 *    Sets up either a direct route or via a proxy.
+		 *    @param SimpleUrl $url   Target to fetch as url object.
+		 *    @return SimpleRoute     Route to take to fetch URL.
+		 *    @access protected
+		 */
+		function &_createRoute($url) {
+			if ($this->_proxy) {
+				$route = new SimpleProxyRoute(
+						$url,
+						$this->_proxy,
+						$this->_proxy_username,
+						$this->_proxy_password);
+			} else {
+				$route = new SimpleRoute($url);
+			}
+			return $route;
+		}
 
-        /**
-         *    Adds additional manual headers.
-         *    @param SimpleHttpRequest $request    Outgoing request.
-         *    @access private
-         */
-        function _addAdditionalHeaders($request) {
-            foreach ($this->_additional_headers as $header) {
-                $request->addHeaderLine($header);
-            }
-        }
-    }
\ No newline at end of file
+		/**
+		 *    Adds additional manual headers.
+		 *    @param SimpleHttpRequest $request    Outgoing request.
+		 *    @access private
+		 */
+		function _addAdditionalHeaders($request) {
+			foreach ($this->_additional_headers as $header) {
+				$request->addHeaderLine($header);
+			}
+		}
+	}
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -15,11 +15,11 @@ 
     require_once(dirname(__FILE__) . '/authentication.php');
     /**#@-*/
 
-    if (! defined('DEFAULT_MAX_REDIRECTS')) {
+    if (!defined('DEFAULT_MAX_REDIRECTS')) {
         define('DEFAULT_MAX_REDIRECTS', 3);
     }
 
-    if (! defined('DEFAULT_CONNECTION_TIMEOUT')) {
+    if (!defined('DEFAULT_CONNECTION_TIMEOUT')) {
         define('DEFAULT_CONNECTION_TIMEOUT', 15);
     }
 
@@ -119,7 +119,7 @@ 
          *    @access public
          */
         function getBaseCookieValue($name, $base) {
-            if (! $base) {
+            if (!$base) {
                 return null;
             }
             return $this->getCookieValue($base->getHost(), $base->getPath(), $name);
@@ -170,12 +170,12 @@ 
          *    @access public
          */
         function useProxy($proxy, $username, $password) {
-            if (! $proxy) {
+            if (!$proxy) {
                 $this->_proxy = false;
                 return;
             }
             if ((strncmp($proxy, 'http://', 7) != 0) && (strncmp($proxy, 'https://', 8) != 0)) {
-                $proxy = 'http://'. $proxy;
+                $proxy = 'http://' . $proxy;
             }
             $this->_proxy = new SimpleUrl($proxy);
             $this->_proxy_username = $username;
@@ -250,11 +250,11 @@ 
                 if ($this->_cookies_enabled) {
                     $headers->writeCookiesToJar($this->_cookie_jar, $url);
                 }
-                if (! $headers->isRedirect()) {
+                if (!$headers->isRedirect()) {
                     break;
                 }
                 $encoding = new SimpleGetEncoding();
-            } while (! $this->_isTooManyRedirects(++$redirects));
+            } while (!$this->_isTooManyRedirects(++$redirects));
             return $response;
         }
 

tests/test_tools/simpletest/web_tester.php

Doc Comments +1 added lines, -12 removed lines

@@ -499,7 +499,7 @@ 
         /**
          *    Creates a new default web browser object.
          *    Will be cleared at the end of the test method.
-         *    @return TestBrowser           New browser.
+         *    @return SimpleBrowser           New browser.
          *    @access public
          */
         function &createBrowser() {
@@ -1065,10 +1065,6 @@ 
         /**
          *    Sets all form fields with that label, or name if there
          *    is no label attached.
-         *    @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 setField($label, $value) {
             return $this->_browser->setField($label, $value);
@@ -1101,13 +1097,6 @@ 
          *    to the expected value. A missing form will always
          *    fail. If no value is given then only the existence
          *    of the field is checked.
-         *    @param string $name       Name of field in forms.
-         *    @param mixed $expected    Expected string/array value or
-         *                              false for unset fields.
-         *    @param string $message    Message to display. Default
-         *                              can be embedded with %s.
-         *    @return boolean           True if pass.
-         *    @access public
          */
         function assertField($label, $expected = true, $message = '%s') {
             $value = $this->_browser->getField($label);

Indentation +1439 added lines, -1439 removed lines

@@ -1,1454 +1,1454 @@
 <?php
-    /**
-     *	Base include file for SimpleTest.
-     *	@package	SimpleTest
-     *	@subpackage	WebTester
-     *	@version	$Id: web_tester.php 1398 2006-09-08 19:31:03Z xue $
-     */
-
-    /**#@+
+	/**
+	 *	Base include file for SimpleTest.
+	 *	@package	SimpleTest
+	 *	@subpackage	WebTester
+	 *	@version	$Id: web_tester.php 1398 2006-09-08 19:31:03Z xue $
+	 */
+
+	/**#@+
      *	include other SimpleTest class files
      */
-    require_once(dirname(__FILE__) . '/test_case.php');
-    require_once(dirname(__FILE__) . '/browser.php');
-    require_once(dirname(__FILE__) . '/page.php');
-    require_once(dirname(__FILE__) . '/expectation.php');
-    /**#@-*/
-
-    /**
-     *    Test for an HTML widget value match.
+	require_once(dirname(__FILE__) . '/test_case.php');
+	require_once(dirname(__FILE__) . '/browser.php');
+	require_once(dirname(__FILE__) . '/page.php');
+	require_once(dirname(__FILE__) . '/expectation.php');
+	/**#@-*/
+
+	/**
+	 *    Test for an HTML widget value match.
 	 *	  @package SimpleTest
 	 *	  @subpackage WebTester
-     */
-    class FieldExpectation extends SimpleExpectation {
-        protected $_value;
-
-        /**
-         *    Sets the field value to compare against.
-         *    @param mixed $value     Test value to match. Can be an
-         *                            expectation for say pattern matching.
-         *    @param string $message  Optiona message override. Can use %s as
-         *                            a placeholder for the original message.
-         *    @access public
-         */
-        function FieldExpectation($value, $message = '%s') {
-            $this->SimpleExpectation($message);
-            if (is_array($value)) {
-                sort($value);
-            }
-            $this->_value = $value;
-        }
-
-        /**
-         *    Tests the expectation. True if it matches
-         *    a string value or an array value in any order.
-         *    @param mixed $compare        Comparison value. False for
-         *                                 an unset field.
-         *    @return boolean              True if correct.
-         *    @access public
-         */
-        function test($compare) {
-            if ($this->_value === false) {
-                return ($compare === false);
-            }
-            if ($this->_isSingle($this->_value)) {
-                return $this->_testSingle($compare);
-            }
-            if (is_array($this->_value)) {
-                return $this->_testMultiple($compare);
-            }
-            return false;
-        }
-
-        /**
-         *    Tests for valid field comparisons with a single option.
-         *    @param mixed $value       Value to type check.
-         *    @return boolean           True if integer, string or float.
-         *    @access private
-         */
-        function _isSingle($value) {
-            return is_string($value) || is_integer($value) || is_float($value);
-        }
-
-        /**
-         *    String comparison for simple field with a single option.
-         *    @param mixed $compare    String to test against.
-         *    @returns boolean         True if matching.
-         *    @access private
-         */
-        function _testSingle($compare) {
-            if (is_array($compare) && count($compare) == 1) {
-                $compare = $compare[0];
-            }
-            if (! $this->_isSingle($compare)) {
-                return false;
-            }
-            return ($this->_value == $compare);
-        }
-
-        /**
-         *    List comparison for multivalue field.
-         *    @param mixed $compare    List in any order to test against.
-         *    @returns boolean         True if matching.
-         *    @access private
-         */
-        function _testMultiple($compare) {
-            if (is_string($compare)) {
-                $compare = array($compare);
-            }
-            if (! is_array($compare)) {
-                return false;
-            }
-            sort($compare);
-            return ($this->_value === $compare);
-        }
-
-        /**
-         *    Returns a human readable test message.
-         *    @param mixed $compare      Comparison value.
-         *    @return string             Description of success
-         *                               or failure.
-         *    @access public
-         */
-        function testMessage($compare) {
-            $dumper = $this->_getDumper();
-            if (is_array($compare)) {
-                sort($compare);
-            }
-            if ($this->test($compare)) {
-                return "Field expectation [" . $dumper->describeValue($this->_value) . "]";
-            } else {
-                return "Field expectation [" . $dumper->describeValue($this->_value) .
-                        "] fails with [" .
-                        $this->_dumper->describeValue($compare) . "] " .
-                        $this->_dumper->describeDifference($this->_value, $compare);
-            }
-        }
-    }
-
-    /**
-     *    Test for a specific HTTP header within a header block.
+	 */
+	class FieldExpectation extends SimpleExpectation {
+		protected $_value;
+
+		/**
+		 *    Sets the field value to compare against.
+		 *    @param mixed $value     Test value to match. Can be an
+		 *                            expectation for say pattern matching.
+		 *    @param string $message  Optiona message override. Can use %s as
+		 *                            a placeholder for the original message.
+		 *    @access public
+		 */
+		function FieldExpectation($value, $message = '%s') {
+			$this->SimpleExpectation($message);
+			if (is_array($value)) {
+				sort($value);
+			}
+			$this->_value = $value;
+		}
+
+		/**
+		 *    Tests the expectation. True if it matches
+		 *    a string value or an array value in any order.
+		 *    @param mixed $compare        Comparison value. False for
+		 *                                 an unset field.
+		 *    @return boolean              True if correct.
+		 *    @access public
+		 */
+		function test($compare) {
+			if ($this->_value === false) {
+				return ($compare === false);
+			}
+			if ($this->_isSingle($this->_value)) {
+				return $this->_testSingle($compare);
+			}
+			if (is_array($this->_value)) {
+				return $this->_testMultiple($compare);
+			}
+			return false;
+		}
+
+		/**
+		 *    Tests for valid field comparisons with a single option.
+		 *    @param mixed $value       Value to type check.
+		 *    @return boolean           True if integer, string or float.
+		 *    @access private
+		 */
+		function _isSingle($value) {
+			return is_string($value) || is_integer($value) || is_float($value);
+		}
+
+		/**
+		 *    String comparison for simple field with a single option.
+		 *    @param mixed $compare    String to test against.
+		 *    @returns boolean         True if matching.
+		 *    @access private
+		 */
+		function _testSingle($compare) {
+			if (is_array($compare) && count($compare) == 1) {
+				$compare = $compare[0];
+			}
+			if (! $this->_isSingle($compare)) {
+				return false;
+			}
+			return ($this->_value == $compare);
+		}
+
+		/**
+		 *    List comparison for multivalue field.
+		 *    @param mixed $compare    List in any order to test against.
+		 *    @returns boolean         True if matching.
+		 *    @access private
+		 */
+		function _testMultiple($compare) {
+			if (is_string($compare)) {
+				$compare = array($compare);
+			}
+			if (! is_array($compare)) {
+				return false;
+			}
+			sort($compare);
+			return ($this->_value === $compare);
+		}
+
+		/**
+		 *    Returns a human readable test message.
+		 *    @param mixed $compare      Comparison value.
+		 *    @return string             Description of success
+		 *                               or failure.
+		 *    @access public
+		 */
+		function testMessage($compare) {
+			$dumper = $this->_getDumper();
+			if (is_array($compare)) {
+				sort($compare);
+			}
+			if ($this->test($compare)) {
+				return "Field expectation [" . $dumper->describeValue($this->_value) . "]";
+			} else {
+				return "Field expectation [" . $dumper->describeValue($this->_value) .
+						"] fails with [" .
+						$this->_dumper->describeValue($compare) . "] " .
+						$this->_dumper->describeDifference($this->_value, $compare);
+			}
+		}
+	}
+
+	/**
+	 *    Test for a specific HTTP header within a header block.
 	 *	  @package SimpleTest
 	 *	  @subpackage WebTester
-     */
-    class HttpHeaderExpectation extends SimpleExpectation {
-        protected $_expected_header;
-        protected $_expected_value;
-
-        /**
-         *    Sets the field and value to compare against.
-         *    @param string $header   Case insenstive trimmed header name.
-         *    @param mixed $value     Optional value to compare. If not
-         *                            given then any value will match. If
-         *                            an expectation object then that will
-         *                            be used instead.
-         *    @param string $message  Optiona message override. Can use %s as
-         *                            a placeholder for the original message.
-         */
-        function HttpHeaderExpectation($header, $value = false, $message = '%s') {
-            $this->SimpleExpectation($message);
-            $this->_expected_header = $this->_normaliseHeader($header);
-            $this->_expected_value = $value;
-        }
-
-        /**
-         *    Accessor for aggregated object.
-         *    @return mixed        Expectation set in constructor.
-         *    @access protected
-         */
-        function _getExpectation() {
-            return $this->_expected_value;
-        }
-
-        /**
-         *    Removes whitespace at ends and case variations.
-         *    @param string $header    Name of header.
-         *    @param string            Trimmed and lowecased header
-         *                             name.
-         *    @access private
-         */
-        function _normaliseHeader($header) {
-            return strtolower(trim($header));
-        }
-
-        /**
-         *    Tests the expectation. True if it matches
-         *    a string value or an array value in any order.
-         *    @param mixed $compare   Raw header block to search.
-         *    @return boolean         True if header present.
-         *    @access public
-         */
-        function test($compare) {
-            return is_string($this->_findHeader($compare));
-        }
-
-        /**
-         *    Searches the incoming result. Will extract the matching
-         *    line as text.
-         *    @param mixed $compare   Raw header block to search.
-         *    @return string          Matching header line.
-         *    @access protected
-         */
-        function _findHeader($compare) {
-            $lines = split("\r\n", $compare);
-            foreach ($lines as $line) {
-                if ($this->_testHeaderLine($line)) {
-                    return $line;
-                }
-            }
-            return false;
-        }
-
-        /**
-         *    Compares a single header line against the expectation.
-         *    @param string $line      A single line to compare.
-         *    @return boolean          True if matched.
-         *    @access private
-         */
-        function _testHeaderLine($line) {
-            if (count($parsed = split(':', $line, 2)) < 2) {
-                return false;
-            }
-            list($header, $value) = $parsed;
-            if ($this->_normaliseHeader($header) != $this->_expected_header) {
-                return false;
-            }
-            return $this->_testHeaderValue($value, $this->_expected_value);
-        }
-
-        /**
-         *    Tests the value part of the header.
-         *    @param string $value        Value to test.
-         *    @param mixed $expected      Value to test against.
-         *    @return boolean             True if matched.
-         *    @access protected
-         */
-        function _testHeaderValue($value, $expected) {
-            if ($expected === false) {
-                return true;
-            }
-            if (SimpleExpectation::isExpectation($expected)) {
-                return $expected->test(trim($value));
-            }
-            return (trim($value) == trim($expected));
-        }
-
-        /**
-         *    Returns a human readable test message.
-         *    @param mixed $compare      Raw header block to search.
-         *    @return string             Description of success
-         *                               or failure.
-         *    @access public
-         */
-        function testMessage($compare) {
-            if (SimpleExpectation::isExpectation($this->_expected_value)) {
-                $message = $this->_expected_value->testMessage($compare);
-            } else {
-                $message = $this->_expected_header .
-                        ($this->_expected_value ? ': ' . $this->_expected_value : '');
-            }
-            if (is_string($line = $this->_findHeader($compare))) {
-                return "Searching for header [$message] found [$line]";
-            } else {
-                return "Failed to find header [$message]";
-            }
-        }
-    }
-
-    /**
-     *    Test for a specific HTTP header within a header block that
-     *    should not be found.
+	 */
+	class HttpHeaderExpectation extends SimpleExpectation {
+		protected $_expected_header;
+		protected $_expected_value;
+
+		/**
+		 *    Sets the field and value to compare against.
+		 *    @param string $header   Case insenstive trimmed header name.
+		 *    @param mixed $value     Optional value to compare. If not
+		 *                            given then any value will match. If
+		 *                            an expectation object then that will
+		 *                            be used instead.
+		 *    @param string $message  Optiona message override. Can use %s as
+		 *                            a placeholder for the original message.
+		 */
+		function HttpHeaderExpectation($header, $value = false, $message = '%s') {
+			$this->SimpleExpectation($message);
+			$this->_expected_header = $this->_normaliseHeader($header);
+			$this->_expected_value = $value;
+		}
+
+		/**
+		 *    Accessor for aggregated object.
+		 *    @return mixed        Expectation set in constructor.
+		 *    @access protected
+		 */
+		function _getExpectation() {
+			return $this->_expected_value;
+		}
+
+		/**
+		 *    Removes whitespace at ends and case variations.
+		 *    @param string $header    Name of header.
+		 *    @param string            Trimmed and lowecased header
+		 *                             name.
+		 *    @access private
+		 */
+		function _normaliseHeader($header) {
+			return strtolower(trim($header));
+		}
+
+		/**
+		 *    Tests the expectation. True if it matches
+		 *    a string value or an array value in any order.
+		 *    @param mixed $compare   Raw header block to search.
+		 *    @return boolean         True if header present.
+		 *    @access public
+		 */
+		function test($compare) {
+			return is_string($this->_findHeader($compare));
+		}
+
+		/**
+		 *    Searches the incoming result. Will extract the matching
+		 *    line as text.
+		 *    @param mixed $compare   Raw header block to search.
+		 *    @return string          Matching header line.
+		 *    @access protected
+		 */
+		function _findHeader($compare) {
+			$lines = split("\r\n", $compare);
+			foreach ($lines as $line) {
+				if ($this->_testHeaderLine($line)) {
+					return $line;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 *    Compares a single header line against the expectation.
+		 *    @param string $line      A single line to compare.
+		 *    @return boolean          True if matched.
+		 *    @access private
+		 */
+		function _testHeaderLine($line) {
+			if (count($parsed = split(':', $line, 2)) < 2) {
+				return false;
+			}
+			list($header, $value) = $parsed;
+			if ($this->_normaliseHeader($header) != $this->_expected_header) {
+				return false;
+			}
+			return $this->_testHeaderValue($value, $this->_expected_value);
+		}
+
+		/**
+		 *    Tests the value part of the header.
+		 *    @param string $value        Value to test.
+		 *    @param mixed $expected      Value to test against.
+		 *    @return boolean             True if matched.
+		 *    @access protected
+		 */
+		function _testHeaderValue($value, $expected) {
+			if ($expected === false) {
+				return true;
+			}
+			if (SimpleExpectation::isExpectation($expected)) {
+				return $expected->test(trim($value));
+			}
+			return (trim($value) == trim($expected));
+		}
+
+		/**
+		 *    Returns a human readable test message.
+		 *    @param mixed $compare      Raw header block to search.
+		 *    @return string             Description of success
+		 *                               or failure.
+		 *    @access public
+		 */
+		function testMessage($compare) {
+			if (SimpleExpectation::isExpectation($this->_expected_value)) {
+				$message = $this->_expected_value->testMessage($compare);
+			} else {
+				$message = $this->_expected_header .
+						($this->_expected_value ? ': ' . $this->_expected_value : '');
+			}
+			if (is_string($line = $this->_findHeader($compare))) {
+				return "Searching for header [$message] found [$line]";
+			} else {
+				return "Failed to find header [$message]";
+			}
+		}
+	}
+
+	/**
+	 *    Test for a specific HTTP header within a header block that
+	 *    should not be found.
 	 *	  @package SimpleTest
 	 *	  @subpackage WebTester
-     */
-    class NoHttpHeaderExpectation extends HttpHeaderExpectation {
-        protected $_expected_header;
-        protected $_expected_value;
-
-        /**
-         *    Sets the field and value to compare against.
-         *    @param string $unwanted   Case insenstive trimmed header name.
-         *    @param string $message    Optiona message override. Can use %s as
-         *                              a placeholder for the original message.
-         */
-        function NoHttpHeaderExpectation($unwanted, $message = '%s') {
-            $this->HttpHeaderExpectation($unwanted, false, $message);
-        }
-
-        /**
-         *    Tests that the unwanted header is not found.
-         *    @param mixed $compare   Raw header block to search.
-         *    @return boolean         True if header present.
-         *    @access public
-         */
-        function test($compare) {
-            return ($this->_findHeader($compare) === false);
-        }
-
-        /**
-         *    Returns a human readable test message.
-         *    @param mixed $compare      Raw header block to search.
-         *    @return string             Description of success
-         *                               or failure.
-         *    @access public
-         */
-        function testMessage($compare) {
-            $expectation = $this->_getExpectation();
-            if (is_string($line = $this->_findHeader($compare))) {
-                return "Found unwanted header [$expectation] with [$line]";
-            } else {
-                return "Did not find unwanted header [$expectation]";
-            }
-        }
-    }
-
-    /**
-     *    Test for a text substring.
+	 */
+	class NoHttpHeaderExpectation extends HttpHeaderExpectation {
+		protected $_expected_header;
+		protected $_expected_value;
+
+		/**
+		 *    Sets the field and value to compare against.
+		 *    @param string $unwanted   Case insenstive trimmed header name.
+		 *    @param string $message    Optiona message override. Can use %s as
+		 *                              a placeholder for the original message.
+		 */
+		function NoHttpHeaderExpectation($unwanted, $message = '%s') {
+			$this->HttpHeaderExpectation($unwanted, false, $message);
+		}
+
+		/**
+		 *    Tests that the unwanted header is not found.
+		 *    @param mixed $compare   Raw header block to search.
+		 *    @return boolean         True if header present.
+		 *    @access public
+		 */
+		function test($compare) {
+			return ($this->_findHeader($compare) === false);
+		}
+
+		/**
+		 *    Returns a human readable test message.
+		 *    @param mixed $compare      Raw header block to search.
+		 *    @return string             Description of success
+		 *                               or failure.
+		 *    @access public
+		 */
+		function testMessage($compare) {
+			$expectation = $this->_getExpectation();
+			if (is_string($line = $this->_findHeader($compare))) {
+				return "Found unwanted header [$expectation] with [$line]";
+			} else {
+				return "Did not find unwanted header [$expectation]";
+			}
+		}
+	}
+
+	/**
+	 *    Test for a text substring.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class TextExpectation extends SimpleExpectation {
-        protected $_substring;
-
-        /**
-         *    Sets the value to compare against.
-         *    @param string $substring  Text to search for.
-         *    @param string $message    Customised message on failure.
-         *    @access public
-         */
-        function TextExpectation($substring, $message = '%s') {
-            $this->SimpleExpectation($message);
-            $this->_substring = $substring;
-        }
-
-        /**
-         *    Accessor for the substring.
-         *    @return string       Text to match.
-         *    @access protected
-         */
-        function _getSubstring() {
-            return $this->_substring;
-        }
-
-        /**
-         *    Tests the expectation. True if the text contains the
-         *    substring.
-         *    @param string $compare        Comparison value.
-         *    @return boolean               True if correct.
-         *    @access public
-         */
-        function test($compare) {
-            return (strpos($compare, $this->_substring) !== false);
-        }
-
-        /**
-         *    Returns a human readable test message.
-         *    @param mixed $compare      Comparison value.
-         *    @return string             Description of success
-         *                               or failure.
-         *    @access public
-         */
-        function testMessage($compare) {
-            if ($this->test($compare)) {
-                return $this->_describeTextMatch($this->_getSubstring(), $compare);
-            } else {
-                $dumper = $this->_getDumper();
-                return "Text [" . $this->_getSubstring() .
-                        "] not detected in [" .
-                        $dumper->describeValue($compare) . "]";
-            }
-        }
-
-        /**
-         *    Describes a pattern match including the string
-         *    found and it's position.
-         *    @param string $substring      Text to search for.
-         *    @param string $subject        Subject to search.
-         *    @access protected
-         */
-        function _describeTextMatch($substring, $subject) {
-            $position = strpos($subject, $substring);
-            $dumper = $this->_getDumper();
-            return "Text [$substring] detected at character [$position] in [" .
-                    $dumper->describeValue($subject) . "] in region [" .
-                    $dumper->clipString($subject, 100, $position) . "]";
-        }
-    }
-
-    /**
-     *    Fail if a substring is detected within the
-     *    comparison text.
+	 */
+	class TextExpectation extends SimpleExpectation {
+		protected $_substring;
+
+		/**
+		 *    Sets the value to compare against.
+		 *    @param string $substring  Text to search for.
+		 *    @param string $message    Customised message on failure.
+		 *    @access public
+		 */
+		function TextExpectation($substring, $message = '%s') {
+			$this->SimpleExpectation($message);
+			$this->_substring = $substring;
+		}
+
+		/**
+		 *    Accessor for the substring.
+		 *    @return string       Text to match.
+		 *    @access protected
+		 */
+		function _getSubstring() {
+			return $this->_substring;
+		}
+
+		/**
+		 *    Tests the expectation. True if the text contains the
+		 *    substring.
+		 *    @param string $compare        Comparison value.
+		 *    @return boolean               True if correct.
+		 *    @access public
+		 */
+		function test($compare) {
+			return (strpos($compare, $this->_substring) !== false);
+		}
+
+		/**
+		 *    Returns a human readable test message.
+		 *    @param mixed $compare      Comparison value.
+		 *    @return string             Description of success
+		 *                               or failure.
+		 *    @access public
+		 */
+		function testMessage($compare) {
+			if ($this->test($compare)) {
+				return $this->_describeTextMatch($this->_getSubstring(), $compare);
+			} else {
+				$dumper = $this->_getDumper();
+				return "Text [" . $this->_getSubstring() .
+						"] not detected in [" .
+						$dumper->describeValue($compare) . "]";
+			}
+		}
+
+		/**
+		 *    Describes a pattern match including the string
+		 *    found and it's position.
+		 *    @param string $substring      Text to search for.
+		 *    @param string $subject        Subject to search.
+		 *    @access protected
+		 */
+		function _describeTextMatch($substring, $subject) {
+			$position = strpos($subject, $substring);
+			$dumper = $this->_getDumper();
+			return "Text [$substring] detected at character [$position] in [" .
+					$dumper->describeValue($subject) . "] in region [" .
+					$dumper->clipString($subject, 100, $position) . "]";
+		}
+	}
+
+	/**
+	 *    Fail if a substring is detected within the
+	 *    comparison text.
 	 *	  @package SimpleTest
 	 *	  @subpackage UnitTester
-     */
-    class NoTextExpectation extends TextExpectation {
-
-        /**
-         *    Sets the reject pattern
-         *    @param string $substring  Text to search for.
-         *    @param string $message    Customised message on failure.
-         *    @access public
-         */
-        function NoTextExpectation($substring, $message = '%s') {
-            $this->TextExpectation($substring, $message);
-        }
-
-        /**
-         *    Tests the expectation. False if the substring appears
-         *    in the text.
-         *    @param string $compare        Comparison value.
-         *    @return boolean               True if correct.
-         *    @access public
-         */
-        function test($compare) {
-            return ! parent::test($compare);
-        }
-
-        /**
-         *    Returns a human readable test message.
-         *    @param string $compare      Comparison value.
-         *    @return string              Description of success
-         *                                or failure.
-         *    @access public
-         */
-        function testMessage($compare) {
-            if ($this->test($compare)) {
-                $dumper = $this->_getDumper();
-                return "Text [" . $this->_getSubstring() .
-                        "] not detected in [" .
-                        $dumper->describeValue($compare) . "]";
-            } else {
-                return $this->_describeTextMatch($this->_getSubstring(), $compare);
-            }
-        }
-    }
-
-    /**
-     *    Test case for testing of web pages. Allows
-     *    fetching of pages, parsing of HTML and
-     *    submitting forms.
+	 */
+	class NoTextExpectation extends TextExpectation {
+
+		/**
+		 *    Sets the reject pattern
+		 *    @param string $substring  Text to search for.
+		 *    @param string $message    Customised message on failure.
+		 *    @access public
+		 */
+		function NoTextExpectation($substring, $message = '%s') {
+			$this->TextExpectation($substring, $message);
+		}
+
+		/**
+		 *    Tests the expectation. False if the substring appears
+		 *    in the text.
+		 *    @param string $compare        Comparison value.
+		 *    @return boolean               True if correct.
+		 *    @access public
+		 */
+		function test($compare) {
+			return ! parent::test($compare);
+		}
+
+		/**
+		 *    Returns a human readable test message.
+		 *    @param string $compare      Comparison value.
+		 *    @return string              Description of success
+		 *                                or failure.
+		 *    @access public
+		 */
+		function testMessage($compare) {
+			if ($this->test($compare)) {
+				$dumper = $this->_getDumper();
+				return "Text [" . $this->_getSubstring() .
+						"] not detected in [" .
+						$dumper->describeValue($compare) . "]";
+			} else {
+				return $this->_describeTextMatch($this->_getSubstring(), $compare);
+			}
+		}
+	}
+
+	/**
+	 *    Test case for testing of web pages. Allows
+	 *    fetching of pages, parsing of HTML and
+	 *    submitting forms.
 	 *    @package SimpleTest
 	 *    @subpackage WebTester
-     */
-    class WebTestCase extends SimpleTestCase {
-        protected $_browser;
-        protected $_ignore_errors = false;
-
-        /**
-         *    Creates an empty test case. Should be subclassed
-         *    with test methods for a functional test case.
-         *    @param string $label     Name of test case. Will use
-         *                             the class name if none specified.
-         *    @access public
-         */
-        function WebTestCase($label = false) {
-            $this->SimpleTestCase($label);
-        }
-
-        /**
-         *    Announces the start of the test.
-         *    @param string $method    Test method just started.
-         *    @access public
-         */
-        function before($method) {
-            parent::before($method);
-            $this->setBrowser($this->createBrowser());
-        }
-
-        /**
-         *    Announces the end of the test. Includes private clean up.
-         *    @param string $method    Test method just finished.
-         *    @access public
-         */
-        function after($method) {
-            $this->unsetBrowser();
-            parent::after($method);
-        }
-
-        /**
-         *    Gets a current browser reference for setting
-         *    special expectations or for detailed
-         *    examination of page fetches.
-         *    @return SimpleBrowser     Current test browser object.
-         *    @access public
-         */
-        function &getBrowser() {
-            return $this->_browser;
-        }
-
-        /**
-         *    Gets a current browser reference for setting
-         *    special expectations or for detailed
-         *    examination of page fetches.
-         *    @param SimpleBrowser $browser    New test browser object.
-         *    @access public
-         */
-        function setBrowser($browser) {
-            return $this->_browser = $browser;
-        }
-
-        /**
-         *    Clears the current browser reference to help the
-         *    PHP garbage collector.
-         *    @access public
-         */
-        function unsetBrowser() {
-            unset($this->_browser);
-        }
-
-        /**
-         *    Creates a new default web browser object.
-         *    Will be cleared at the end of the test method.
-         *    @return TestBrowser           New browser.
-         *    @access public
-         */
-        function &createBrowser() {
-            $browser = new SimpleBrowser();
-            return $browser;
-        }
-
-        /**
-         *    Gets the last response error.
-         *    @return string    Last low level HTTP error.
-         *    @access public
-         */
-        function getTransportError() {
-            return $this->_browser->getTransportError();
-        }
-
-        /**
-         *    Accessor for the currently selected URL.
-         *    @return string        Current location or false if
-         *                          no page yet fetched.
-         *    @access public
-         */
-        function getUrl() {
-            return $this->_browser->getUrl();
-        }
-
-        /**
-         *    Dumps the current request for debugging.
-         *    @access public
-         */
-        function showRequest() {
-            $this->dump($this->_browser->getRequest());
-        }
-
-        /**
-         *    Dumps the current HTTP headers for debugging.
-         *    @access public
-         */
-        function showHeaders() {
-            $this->dump($this->_browser->getHeaders());
-        }
-
-        /**
-         *    Dumps the current HTML source for debugging.
-         *    @access public
-         */
-        function showSource() {
-            $this->dump($this->_browser->getContent());
-        }
-
-        /**
-         *    Dumps the visible text only for debugging.
-         *    @access public
-         */
-        function showText() {
-            $this->dump(wordwrap($this->_browser->getContentAsText(), 80));
-        }
-
-        /**
-         *    Simulates the closing and reopening of the browser.
-         *    Temporary cookies will be discarded and timed
-         *    cookies will be expired if later than the
-         *    specified time.
-         *    @param string/integer $date Time when session restarted.
-         *                                If ommitted then all persistent
-         *                                cookies are kept. Time is either
-         *                                Cookie format string or timestamp.
-         *    @access public
-         */
-        function restart($date = false) {
-            if ($date === false) {
-                $date = time();
-            }
-            $this->_browser->restart($date);
-        }
-
-        /**
-         *    Moves cookie expiry times back into the past.
-         *    Useful for testing timeouts and expiries.
-         *    @param integer $interval    Amount to age in seconds.
-         *    @access public
-         */
-        function ageCookies($interval) {
-            $this->_browser->ageCookies($interval);
-        }
-
-        /**
-         *    Disables frames support. Frames will not be fetched
-         *    and the frameset page will be used instead.
-         *    @access public
-         */
-        function ignoreFrames() {
-            $this->_browser->ignoreFrames();
-        }
-
-        /**
-         *    Switches off cookie sending and recieving.
-         *    @access public
-         */
-        function ignoreCookies() {
-            $this->_browser->ignoreCookies();
-        }
-
-        /**
-         *    Skips errors for the next request only. You might
-         *    want to confirm that a page is unreachable for
-         *    example.
-         *    @access public
-         */
-        function ignoreErrors() {
-            $this->_ignore_errors = true;
-        }
-
-        /**
-         *    Issues a fail if there is a transport error anywhere
-         *    in the current frameset. Only one such error is
-         *    reported.
-         *    @param string/boolean $result   HTML or failure.
-         *    @return string/boolean $result  Passes through result.
-         *    @access private
-         */
-        function _failOnError($result) {
-            if (! $this->_ignore_errors) {
-                if ($error = $this->_browser->getTransportError()) {
-                    $this->fail($error);
-                }
-            }
-            $this->_ignore_errors = false;
-            return $result;
-        }
-
-        /**
-         *    Adds a header to every fetch.
-         *    @param string $header       Header line to add to every
-         *                                request until cleared.
-         *    @access public
-         */
-        function addHeader($header) {
-            $this->_browser->addHeader($header);
-        }
-
-        /**
-         *    Sets the maximum number of redirects before
-         *    the web page is loaded regardless.
-         *    @param integer $max        Maximum hops.
-         *    @access public
-         */
-        function setMaximumRedirects($max) {
-            if (! $this->_browser) {
-                trigger_error(
-                        'Can only set maximum redirects in a test method, setUp() or tearDown()');
-            }
-            $this->_browser->setMaximumRedirects($max);
-        }
-
-        /**
-         *    Sets the socket timeout for opening a connection and
-         *    receiving at least one byte of information.
-         *    @param integer $timeout      Maximum time in seconds.
-         *    @access public
-         */
-        function setConnectionTimeout($timeout) {
-            $this->_browser->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->_browser->useProxy($proxy, $username, $password);
-        }
-
-        /**
-         *    Fetches a page into the page buffer. If
-         *    there is no base for the URL then the
-         *    current base URL is used. After the fetch
-         *    the base URL reflects the new location.
-         *    @param string $url          URL to fetch.
-         *    @param hash $parameters     Optional additional GET data.
-         *    @return boolean/string      Raw page on success.
-         *    @access public
-         */
-        function get($url, $parameters = false) {
-            return $this->_failOnError($this->_browser->get($url, $parameters));
-        }
-
-        /**
-         *    Fetches a page by POST into the page buffer.
-         *    If there is no base for the URL then the
-         *    current base URL is used. After the fetch
-         *    the base URL reflects the new location.
-         *    @param string $url          URL to fetch.
-         *    @param hash $parameters     Optional additional GET data.
-         *    @return boolean/string      Raw page on success.
-         *    @access public
-         */
-        function post($url, $parameters = false) {
-            return $this->_failOnError($this->_browser->post($url, $parameters));
-        }
-
-        /**
-         *    Does a HTTP HEAD fetch, fetching only the page
-         *    headers. The current base URL is unchanged by this.
-         *    @param string $url          URL to fetch.
-         *    @param hash $parameters     Optional additional GET data.
-         *    @return boolean             True on success.
-         *    @access public
-         */
-        function head($url, $parameters = false) {
-            return $this->_failOnError($this->_browser->head($url, $parameters));
-        }
-
-        /**
-         *    Equivalent to hitting the retry button on the
-         *    browser. Will attempt to repeat the page fetch.
-         *    @return boolean     True if fetch succeeded.
-         *    @access public
-         */
-        function retry() {
-            return $this->_failOnError($this->_browser->retry());
-        }
-
-        /**
-         *    Equivalent to hitting the back button on the
-         *    browser.
-         *    @return boolean     True if history entry and
-         *                        fetch succeeded.
-         *    @access public
-         */
-        function back() {
-            return $this->_failOnError($this->_browser->back());
-        }
-
-        /**
-         *    Equivalent to hitting the forward button on the
-         *    browser.
-         *    @return boolean     True if history entry and
-         *                        fetch succeeded.
-         *    @access public
-         */
-        function forward() {
-            return $this->_failOnError($this->_browser->forward());
-        }
-
-        /**
-         *    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/string     HTML on successful fetch. Note
-         *                               that authentication may still have
-         *                               failed.
-         *    @access public
-         */
-        function authenticate($username, $password) {
-            return $this->_failOnError(
-                    $this->_browser->authenticate($username, $password));
-        }
-
-        /**
-         *    Gets the cookie value for the current browser context.
-         *    @param string $name          Name of cookie.
-         *    @return string               Value of cookie or false if unset.
-         *    @access public
-         */
-        function getCookie($name) {
-            return $this->_browser->getCurrentCookieValue($name);
-        }
-
-        /**
-         *    Sets a cookie in the current browser.
-         *    @param string $name          Name of cookie.
-         *    @param string $value         Cookie value.
-         *    @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->_browser->setCookie($name, $value, $host, $path, $expiry);
-        }
-
-        /**
-         *    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->_browser->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->_browser->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->_browser->setFrameFocus($name);
-        }
-
-        /**
-         *    Clears the frame focus. All frames will be searched
-         *    for content.
-         *    @access public
-         */
-        function clearFrameFocus() {
-            return $this->_browser->clearFrameFocus();
-        }
-
-        /**
-         *    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) {
-            return $this->_failOnError($this->_browser->click($label));
-        }
-
-        /**
-         *    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 values.
-         *    @return boolean/string  Page on success, else false.
-         *    @access public
-         */
-        function clickSubmit($label = 'Submit', $additional = false) {
-            return $this->_failOnError(
-                    $this->_browser->clickSubmit($label, $additional));
-        }
-
-        /**
-         *    Clicks the submit button by name attribute. The owning
-         *    form will be submitted by this.
-         *    @param string $name     Name attribute of button.
-         *    @param hash $additional Additional form values.
-         *    @return boolean/string  Page on success.
-         *    @access public
-         */
-        function clickSubmitByName($name, $additional = false) {
-            return $this->_failOnError(
-                    $this->_browser->clickSubmitByName($name, $additional));
-        }
-
-        /**
-         *    Clicks the submit button by ID attribute. The owning
-         *    form will be submitted by this.
-         *    @param string $id       ID attribute of button.
-         *    @param hash $additional Additional form values.
-         *    @return boolean/string  Page on success.
-         *    @access public
-         */
-        function clickSubmitById($id, $additional = false) {
-            return $this->_failOnError(
-                    $this->_browser->clickSubmitById($id, $additional));
-        }
-
-        /**
-         *    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    Alt attribute of button.
-         *    @param integer $x       X-coordinate of imaginary click.
-         *    @param integer $y       Y-coordinate of imaginary click.
-         *    @param hash $additional Additional form values.
-         *    @return boolean/string  Page on success.
-         *    @access public
-         */
-        function clickImage($label, $x = 1, $y = 1, $additional = false) {
-            return $this->_failOnError(
-                    $this->_browser->clickImage($label, $x, $y, $additional));
-        }
-
-        /**
-         *    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 values.
-         *    @return boolean/string  Page on success.
-         *    @access public
-         */
-        function clickImageByName($name, $x = 1, $y = 1, $additional = false) {
-            return $this->_failOnError(
-                    $this->_browser->clickImageByName($name, $x, $y, $additional));
-        }
-
-        /**
-         *    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 values.
-         *    @return boolean/string      Page on success.
-         *    @access public
-         */
-        function clickImageById($id, $x = 1, $y = 1, $additional = false) {
-            return $this->_failOnError(
-                    $this->_browser->clickImageById($id, $x, $y, $additional));
-        }
-
-        /**
-         *    Submits a form by the ID.
-         *    @param string $id       Form ID. No button information
-         *                            is submitted this way.
-         *    @return boolean/string  Page on success.
-         *    @access public
-         */
-        function submitFormById($id) {
-            return $this->_failOnError($this->_browser->submitFormById($id));
-        }
-
-        /**
-         *    Follows a link by name. Will click the first link
-         *    found with this link text by default, or a later
-         *    one if an index is given. Match is case insensitive
-         *    with normalised space.
-         *    @param string $label     Text between the anchor tags.
-         *    @param integer $index    Link position counting from zero.
-         *    @return boolean/string   Page on success.
-         *    @access public
-         */
-        function clickLink($label, $index = 0) {
-            return $this->_failOnError($this->_browser->clickLink($label, $index));
-        }
-
-        /**
-         *    Follows a link by id attribute.
-         *    @param string $id        ID attribute value.
-         *    @return boolean/string   Page on success.
-         *    @access public
-         */
-        function clickLinkById($id) {
-            return $this->_failOnError($this->_browser->clickLinkById($id));
-        }
-
-        /**
-         *    Will trigger a pass if the two parameters have
-         *    the same value only. Otherwise a fail. This
-         *    is for testing hand extracted text, etc.
-         *    @param mixed $first          Value to compare.
-         *    @param mixed $second         Value to compare.
-         *    @param string $message       Message to display.
-         *    @return boolean              True on pass
-         *    @access public
-         */
-        function assertEqual($first, $second, $message = "%s") {
-            return $this->assert(
-                    new EqualExpectation($first),
-                    $second,
-                    $message);
-        }
-
-        /**
-         *    Will trigger a pass if the two parameters have
-         *    a different value. Otherwise a fail. This
-         *    is for testing hand extracted text, etc.
-         *    @param mixed $first           Value to compare.
-         *    @param mixed $second          Value to compare.
-         *    @param string $message        Message to display.
-         *    @return boolean               True on pass
-         *    @access public
-         */
-        function assertNotEqual($first, $second, $message = "%s") {
-            return $this->assert(
-                    new NotEqualExpectation($first),
-                    $second,
-                    $message);
-        }
-
-        /**
-         *    Tests for the presence of a link label. Match is
-         *    case insensitive with normalised space.
-         *    @param string $label     Text between the anchor tags.
-         *    @param string $message   Message to display. Default
-         *                             can be embedded with %s.
-         *    @return boolean          True if link present.
-         *    @access public
-         */
-        function assertLink($label, $message = "%s") {
-            return $this->assertTrue(
-                    $this->_browser->isLink($label),
-                    sprintf($message, "Link [$label] should exist"));
-        }
-
-        /**
-         *    Tests for the non-presence of a link label. Match is
-         *    case insensitive with normalised space.
-         *    @param string/integer $label    Text between the anchor tags
-         *                                    or ID attribute.
-         *    @param string $message          Message to display. Default
-         *                                    can be embedded with %s.
-         *    @return boolean                 True if link missing.
-         *    @access public
-         */
-        function assertNoLink($label, $message = "%s") {
-            return $this->assertFalse(
-                    $this->_browser->isLink($label),
-                    sprintf($message, "Link [$label] should not exist"));
-        }
-
-        /**
-         *    Tests for the presence of a link id attribute.
-         *    @param string $id        Id attribute value.
-         *    @param string $message   Message to display. Default
-         *                             can be embedded with %s.
-         *    @return boolean          True if link present.
-         *    @access public
-         */
-        function assertLinkById($id, $message = "%s") {
-            return $this->assertTrue(
-                    $this->_browser->isLinkById($id),
-                    sprintf($message, "Link ID [$id] should exist"));
-        }
-
-        /**
-         *    Tests for the non-presence of a link label. Match is
-         *    case insensitive with normalised space.
-         *    @param string $id        Id attribute value.
-         *    @param string $message   Message to display. Default
-         *                             can be embedded with %s.
-         *    @return boolean          True if link missing.
-         *    @access public
-         */
-        function assertNoLinkById($id, $message = "%s") {
-            return $this->assertFalse(
-                    $this->_browser->isLinkById($id),
-                    sprintf($message, "Link ID [$id] should not exist"));
-        }
-
-        /**
-         *    Sets all form fields with that label, or name if there
-         *    is no label attached.
-         *    @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 setField($label, $value) {
-            return $this->_browser->setField($label, $value);
-        }
-
-        /**
-         *    Sets all form fields with that name.
-         *    @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->_browser->setFieldByName($name, $value);
-        }
-
-        /**
-         *    Sets all form fields with that name.
-         *    @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->_browser->setFieldById($id, $value);
-        }
-
-        /**
-         *    Confirms that the form element is currently set
-         *    to the expected value. A missing form will always
-         *    fail. If no value is given then only the existence
-         *    of the field is checked.
-         *    @param string $name       Name of field in forms.
-         *    @param mixed $expected    Expected string/array value or
-         *                              false for unset fields.
-         *    @param string $message    Message to display. Default
-         *                              can be embedded with %s.
-         *    @return boolean           True if pass.
-         *    @access public
-         */
-        function assertField($label, $expected = true, $message = '%s') {
-            $value = $this->_browser->getField($label);
-            return $this->_assertFieldValue($label, $value, $expected, $message);
-        }
-
-        /**
-         *    Confirms that the form element is currently set
-         *    to the expected value. A missing form element will always
-         *    fail. If no value is given then only the existence
-         *    of the field is checked.
-         *    @param string $name       Name of field in forms.
-         *    @param mixed $expected    Expected string/array value or
-         *                              false for unset fields.
-         *    @param string $message    Message to display. Default
-         *                              can be embedded with %s.
-         *    @return boolean           True if pass.
-         *    @access public
-         */
-        function assertFieldByName($name, $expected = true, $message = '%s') {
-            $value = $this->_browser->getFieldByName($name);
-            return $this->_assertFieldValue($name, $value, $expected, $message);
-        }
-
-        /**
-         *    Confirms that the form element is currently set
-         *    to the expected value. A missing form will always
-         *    fail. If no ID is given then only the existence
-         *    of the field is checked.
-         *    @param string/integer $id  Name of field in forms.
-         *    @param mixed $expected     Expected string/array value or
-         *                               false for unset fields.
-         *    @param string $message     Message to display. Default
-         *                               can be embedded with %s.
-         *    @return boolean            True if pass.
-         *    @access public
-         */
-        function assertFieldById($id, $expected = true, $message = '%s') {
-            $value = $this->_browser->getFieldById($id);
-            return $this->_assertFieldValue($id, $value, $expected, $message);
-        }
-
-        /**
-         *    Tests the field value against the expectation.
-         *    @param string $identifier      Name, ID or label.
-         *    @param mixed $value            Current field value.
-         *    @param mixed $expected         Expected value to match.
-         *    @param string $message         Failure message.
-         *    @return boolean                True if pass
-         *    @access protected
-         */
-        function _assertFieldValue($identifier, $value, $expected, $message) {
-            if ($expected === true) {
-                return $this->assertTrue(
-                        isset($value),
-                        sprintf($message, "Field [$identifier] should exist"));
-            }
-            if (! SimpleExpectation::isExpectation($expected)) {
-                $identifier = str_replace('%', '%%', $identifier);
-                $expected = new FieldExpectation(
-                        $expected,
-                        "Field [$identifier] should match with [%s]");
-            }
-            return $this->assert($expected, $value, $message);
-        }
-
-        /**
-         *    Checks the response code against a list
-         *    of possible values.
-         *    @param array $responses    Possible responses for a pass.
-         *    @param string $message     Message to display. Default
-         *                               can be embedded with %s.
-         *    @return boolean            True if pass.
-         *    @access public
-         */
-        function assertResponse($responses, $message = '%s') {
-            $responses = (is_array($responses) ? $responses : array($responses));
-            $code = $this->_browser->getResponseCode();
-            $message = sprintf($message, "Expecting response in [" .
-                    implode(", ", $responses) . "] got [$code]");
-            return $this->assertTrue(in_array($code, $responses), $message);
-        }
-
-        /**
-         *    Checks the mime type against a list
-         *    of possible values.
-         *    @param array $types      Possible mime types for a pass.
-         *    @param string $message   Message to display.
-         *    @return boolean          True if pass.
-         *    @access public
-         */
-        function assertMime($types, $message = '%s') {
-            $types = (is_array($types) ? $types : array($types));
-            $type = $this->_browser->getMimeType();
-            $message = sprintf($message, "Expecting mime type in [" .
-                    implode(", ", $types) . "] got [$type]");
-            return $this->assertTrue(in_array($type, $types), $message);
-        }
-
-        /**
-         *    Attempt to match the authentication type within
-         *    the security realm we are currently matching.
-         *    @param string $authentication   Usually basic.
-         *    @param string $message          Message to display.
-         *    @return boolean                 True if pass.
-         *    @access public
-         */
-        function assertAuthentication($authentication = false, $message = '%s') {
-            if (! $authentication) {
-                $message = sprintf($message, "Expected any authentication type, got [" .
-                        $this->_browser->getAuthentication() . "]");
-                return $this->assertTrue(
-                        $this->_browser->getAuthentication(),
-                        $message);
-            } else {
-                $message = sprintf($message, "Expected authentication [$authentication] got [" .
-                        $this->_browser->getAuthentication() . "]");
-                return $this->assertTrue(
-                        strtolower($this->_browser->getAuthentication()) == strtolower($authentication),
-                        $message);
-            }
-        }
-
-        /**
-         *    Checks that no authentication is necessary to view
-         *    the desired page.
-         *    @param string $message     Message to display.
-         *    @return boolean            True if pass.
-         *    @access public
-         */
-        function assertNoAuthentication($message = '%s') {
-            $message = sprintf($message, "Expected no authentication type, got [" .
-                    $this->_browser->getAuthentication() . "]");
-            return $this->assertFalse($this->_browser->getAuthentication(), $message);
-        }
-
-        /**
-         *    Attempts to match the current security realm.
-         *    @param string $realm     Name of security realm.
-         *    @param string $message   Message to display.
-         *    @return boolean          True if pass.
-         *    @access public
-         */
-        function assertRealm($realm, $message = '%s') {
-            if (! SimpleExpectation::isExpectation($realm)) {
-                $realm = new EqualExpectation($realm);
-            }
-            return $this->assert(
-                    $realm,
-                    $this->_browser->getRealm(),
-                    "Expected realm -> $message");
-        }
-
-        /**
-         *    Checks each header line for the required value. If no
-         *    value is given then only an existence check is made.
-         *    @param string $header    Case insensitive header name.
-         *    @param mixed $value      Case sensitive trimmed string to
-         *                             match against. An expectation object
-         *                             can be used for pattern matching.
-         *    @return boolean          True if pass.
-         *    @access public
-         */
-        function assertHeader($header, $value = false, $message = '%s') {
-            return $this->assert(
-                    new HttpHeaderExpectation($header, $value),
-                    $this->_browser->getHeaders(),
-                    $message);
-        }
-
-        /**
-         *    @deprecated
-         */
-        function assertHeaderPattern($header, $pattern, $message = '%s') {
-            return $this->assert(
-                    new HttpHeaderExpectation($header, new PatternExpectation($pattern)),
-                    $this->_browser->getHeaders(),
-                    $message);
-        }
-
-        /**
-         *    Confirms that the header type has not been received.
-         *    Only the landing page is checked. If you want to check
-         *    redirect pages, then you should limit redirects so
-         *    as to capture the page you want.
-         *    @param string $header    Case insensitive header name.
-         *    @return boolean          True if pass.
-         *    @access public
-         */
-        function assertNoHeader($header, $message = '%s') {
-            return $this->assert(
-                    new NoHttpHeaderExpectation($header),
-                    $this->_browser->getHeaders(),
-                    $message);
-        }
-
-        /**
-         *    @deprecated
-         */
-        function assertNoUnwantedHeader($header, $message = '%s') {
-            return $this->assertNoHeader($header, $message);
-        }
-
-        /**
-         *    Tests the text between the title tags.
-         *    @param string $title      Expected title.
-         *    @param string $message    Message to display.
-         *    @return boolean           True if pass.
-         *    @access public
-         */
-        function assertTitle($title = false, $message = '%s') {
-            if (! SimpleExpectation::isExpectation($title)) {
-                $title = new EqualExpectation($title);
-            }
-            return $this->assert($title, $this->_browser->getTitle(), $message);
-        }
-
-        /**
-         *    Will trigger a pass if the text is found in the plain
-         *    text form of the page.
-         *    @param string $text       Text to look for.
-         *    @param string $message    Message to display.
-         *    @return boolean           True if pass.
-         *    @access public
-         */
-        function assertText($text, $message = '%s') {
-            return $this->assert(
-                    new TextExpectation($text),
-                    $this->_browser->getContentAsText(),
-                    $message);
-        }
-
-        /**
-         *	  @deprecated
-         */
-        function assertWantedText($text, $message = '%s') {
-        	return $this->assertText($text, $message);
-        }
-
-        /**
-         *    Will trigger a pass if the text is not found in the plain
-         *    text form of the page.
-         *    @param string $text       Text to look for.
-         *    @param string $message    Message to display.
-         *    @return boolean           True if pass.
-         *    @access public
-         */
-        function assertNoText($text, $message = '%s') {
-            return $this->assert(
-                    new NoTextExpectation($text),
-                    $this->_browser->getContentAsText(),
-                    $message);
-        }
-
-        /**
-         *	  @deprecated
-         */
-        function assertNoUnwantedText($text, $message = '%s') {
-        	return $this->assertNoText($text, $message);
-        }
-
-        /**
-         *    Will trigger a pass if the Perl regex pattern
-         *    is found in the raw content.
-         *    @param string $pattern    Perl regex to look for including
-         *                              the regex delimiters.
-         *    @param string $message    Message to display.
-         *    @return boolean           True if pass.
-         *    @access public
-         */
-        function assertPattern($pattern, $message = '%s') {
-            return $this->assert(
-                    new PatternExpectation($pattern),
-                    $this->_browser->getContent(),
-                    $message);
-        }
-
-        /**
-         *	  @deprecated
-         */
-        function assertWantedPattern($pattern, $message = '%s') {
-        	return $this->assertPattern($pattern, $message);
-        }
-
-        /**
-         *    Will trigger a pass if the perl regex pattern
-         *    is not present in raw content.
-         *    @param string $pattern    Perl regex to look for including
-         *                              the regex delimiters.
-         *    @param string $message    Message to display.
-         *    @return boolean           True if pass.
-         *    @access public
-         */
-        function assertNoPattern($pattern, $message = '%s') {
-            return $this->assert(
-                    new NoPatternExpectation($pattern),
-                    $this->_browser->getContent(),
-                    $message);
-        }
-
-        /**
-         *	  @deprecated
-         */
-        function assertNoUnwantedPattern($pattern, $message = '%s') {
-        	return $this->assertNoPattern($pattern, $message);
-        }
-
-        /**
-         *    Checks that a cookie is set for the current page
-         *    and optionally checks the value.
-         *    @param string $name        Name of cookie to test.
-         *    @param string $expected    Expected value as a string or
-         *                               false if any value will do.
-         *    @param string $message     Message to display.
-         *    @return boolean            True if pass.
-         *    @access public
-         */
-        function assertCookie($name, $expected = false, $message = '%s') {
-            $value = $this->getCookie($name);
-            if (! $expected) {
-                return $this->assertTrue(
-                        $value,
-                        sprintf($message, "Expecting cookie [$name]"));
-            }
-            if (! SimpleExpectation::isExpectation($expected)) {
-                $expected = new EqualExpectation($expected);
-            }
-            return $this->assert($expected, $value, "Expecting cookie [$name] -> $message");
-        }
-
-        /**
-         *    Checks that no cookie is present or that it has
-         *    been successfully cleared.
-         *    @param string $name        Name of cookie to test.
-         *    @param string $message     Message to display.
-         *    @return boolean            True if pass.
-         *    @access public
-         */
-        function assertNoCookie($name, $message = '%s') {
-            return $this->assertTrue(
-                    $this->getCookie($name) === false,
-                    sprintf($message, "Not expecting cookie [$name]"));
-        }
-    }
\ No newline at end of file
+	 */
+	class WebTestCase extends SimpleTestCase {
+		protected $_browser;
+		protected $_ignore_errors = false;
+
+		/**
+		 *    Creates an empty test case. Should be subclassed
+		 *    with test methods for a functional test case.
+		 *    @param string $label     Name of test case. Will use
+		 *                             the class name if none specified.
+		 *    @access public
+		 */
+		function WebTestCase($label = false) {
+			$this->SimpleTestCase($label);
+		}
+
+		/**
+		 *    Announces the start of the test.
+		 *    @param string $method    Test method just started.
+		 *    @access public
+		 */
+		function before($method) {
+			parent::before($method);
+			$this->setBrowser($this->createBrowser());
+		}
+
+		/**
+		 *    Announces the end of the test. Includes private clean up.
+		 *    @param string $method    Test method just finished.
+		 *    @access public
+		 */
+		function after($method) {
+			$this->unsetBrowser();
+			parent::after($method);
+		}
+
+		/**
+		 *    Gets a current browser reference for setting
+		 *    special expectations or for detailed
+		 *    examination of page fetches.
+		 *    @return SimpleBrowser     Current test browser object.
+		 *    @access public
+		 */
+		function &getBrowser() {
+			return $this->_browser;
+		}
+
+		/**
+		 *    Gets a current browser reference for setting
+		 *    special expectations or for detailed
+		 *    examination of page fetches.
+		 *    @param SimpleBrowser $browser    New test browser object.
+		 *    @access public
+		 */
+		function setBrowser($browser) {
+			return $this->_browser = $browser;
+		}
+
+		/**
+		 *    Clears the current browser reference to help the
+		 *    PHP garbage collector.
+		 *    @access public
+		 */
+		function unsetBrowser() {
+			unset($this->_browser);
+		}
+
+		/**
+		 *    Creates a new default web browser object.
+		 *    Will be cleared at the end of the test method.
+		 *    @return TestBrowser           New browser.
+		 *    @access public
+		 */
+		function &createBrowser() {
+			$browser = new SimpleBrowser();
+			return $browser;
+		}
+
+		/**
+		 *    Gets the last response error.
+		 *    @return string    Last low level HTTP error.
+		 *    @access public
+		 */
+		function getTransportError() {
+			return $this->_browser->getTransportError();
+		}
+
+		/**
+		 *    Accessor for the currently selected URL.
+		 *    @return string        Current location or false if
+		 *                          no page yet fetched.
+		 *    @access public
+		 */
+		function getUrl() {
+			return $this->_browser->getUrl();
+		}
+
+		/**
+		 *    Dumps the current request for debugging.
+		 *    @access public
+		 */
+		function showRequest() {
+			$this->dump($this->_browser->getRequest());
+		}
+
+		/**
+		 *    Dumps the current HTTP headers for debugging.
+		 *    @access public
+		 */
+		function showHeaders() {
+			$this->dump($this->_browser->getHeaders());
+		}
+
+		/**
+		 *    Dumps the current HTML source for debugging.
+		 *    @access public
+		 */
+		function showSource() {
+			$this->dump($this->_browser->getContent());
+		}
+
+		/**
+		 *    Dumps the visible text only for debugging.
+		 *    @access public
+		 */
+		function showText() {
+			$this->dump(wordwrap($this->_browser->getContentAsText(), 80));
+		}
+
+		/**
+		 *    Simulates the closing and reopening of the browser.
+		 *    Temporary cookies will be discarded and timed
+		 *    cookies will be expired if later than the
+		 *    specified time.
+		 *    @param string/integer $date Time when session restarted.
+		 *                                If ommitted then all persistent
+		 *                                cookies are kept. Time is either
+		 *                                Cookie format string or timestamp.
+		 *    @access public
+		 */
+		function restart($date = false) {
+			if ($date === false) {
+				$date = time();
+			}
+			$this->_browser->restart($date);
+		}
+
+		/**
+		 *    Moves cookie expiry times back into the past.
+		 *    Useful for testing timeouts and expiries.
+		 *    @param integer $interval    Amount to age in seconds.
+		 *    @access public
+		 */
+		function ageCookies($interval) {
+			$this->_browser->ageCookies($interval);
+		}
+
+		/**
+		 *    Disables frames support. Frames will not be fetched
+		 *    and the frameset page will be used instead.
+		 *    @access public
+		 */
+		function ignoreFrames() {
+			$this->_browser->ignoreFrames();
+		}
+
+		/**
+		 *    Switches off cookie sending and recieving.
+		 *    @access public
+		 */
+		function ignoreCookies() {
+			$this->_browser->ignoreCookies();
+		}
+
+		/**
+		 *    Skips errors for the next request only. You might
+		 *    want to confirm that a page is unreachable for
+		 *    example.
+		 *    @access public
+		 */
+		function ignoreErrors() {
+			$this->_ignore_errors = true;
+		}
+
+		/**
+		 *    Issues a fail if there is a transport error anywhere
+		 *    in the current frameset. Only one such error is
+		 *    reported.
+		 *    @param string/boolean $result   HTML or failure.
+		 *    @return string/boolean $result  Passes through result.
+		 *    @access private
+		 */
+		function _failOnError($result) {
+			if (! $this->_ignore_errors) {
+				if ($error = $this->_browser->getTransportError()) {
+					$this->fail($error);
+				}
+			}
+			$this->_ignore_errors = false;
+			return $result;
+		}
+
+		/**
+		 *    Adds a header to every fetch.
+		 *    @param string $header       Header line to add to every
+		 *                                request until cleared.
+		 *    @access public
+		 */
+		function addHeader($header) {
+			$this->_browser->addHeader($header);
+		}
+
+		/**
+		 *    Sets the maximum number of redirects before
+		 *    the web page is loaded regardless.
+		 *    @param integer $max        Maximum hops.
+		 *    @access public
+		 */
+		function setMaximumRedirects($max) {
+			if (! $this->_browser) {
+				trigger_error(
+						'Can only set maximum redirects in a test method, setUp() or tearDown()');
+			}
+			$this->_browser->setMaximumRedirects($max);
+		}
+
+		/**
+		 *    Sets the socket timeout for opening a connection and
+		 *    receiving at least one byte of information.
+		 *    @param integer $timeout      Maximum time in seconds.
+		 *    @access public
+		 */
+		function setConnectionTimeout($timeout) {
+			$this->_browser->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->_browser->useProxy($proxy, $username, $password);
+		}
+
+		/**
+		 *    Fetches a page into the page buffer. If
+		 *    there is no base for the URL then the
+		 *    current base URL is used. After the fetch
+		 *    the base URL reflects the new location.
+		 *    @param string $url          URL to fetch.
+		 *    @param hash $parameters     Optional additional GET data.
+		 *    @return boolean/string      Raw page on success.
+		 *    @access public
+		 */
+		function get($url, $parameters = false) {
+			return $this->_failOnError($this->_browser->get($url, $parameters));
+		}
+
+		/**
+		 *    Fetches a page by POST into the page buffer.
+		 *    If there is no base for the URL then the
+		 *    current base URL is used. After the fetch
+		 *    the base URL reflects the new location.
+		 *    @param string $url          URL to fetch.
+		 *    @param hash $parameters     Optional additional GET data.
+		 *    @return boolean/string      Raw page on success.
+		 *    @access public
+		 */
+		function post($url, $parameters = false) {
+			return $this->_failOnError($this->_browser->post($url, $parameters));
+		}
+
+		/**
+		 *    Does a HTTP HEAD fetch, fetching only the page
+		 *    headers. The current base URL is unchanged by this.
+		 *    @param string $url          URL to fetch.
+		 *    @param hash $parameters     Optional additional GET data.
+		 *    @return boolean             True on success.
+		 *    @access public
+		 */
+		function head($url, $parameters = false) {
+			return $this->_failOnError($this->_browser->head($url, $parameters));
+		}
+
+		/**
+		 *    Equivalent to hitting the retry button on the
+		 *    browser. Will attempt to repeat the page fetch.
+		 *    @return boolean     True if fetch succeeded.
+		 *    @access public
+		 */
+		function retry() {
+			return $this->_failOnError($this->_browser->retry());
+		}
+
+		/**
+		 *    Equivalent to hitting the back button on the
+		 *    browser.
+		 *    @return boolean     True if history entry and
+		 *                        fetch succeeded.
+		 *    @access public
+		 */
+		function back() {
+			return $this->_failOnError($this->_browser->back());
+		}
+
+		/**
+		 *    Equivalent to hitting the forward button on the
+		 *    browser.
+		 *    @return boolean     True if history entry and
+		 *                        fetch succeeded.
+		 *    @access public
+		 */
+		function forward() {
+			return $this->_failOnError($this->_browser->forward());
+		}
+
+		/**
+		 *    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/string     HTML on successful fetch. Note
+		 *                               that authentication may still have
+		 *                               failed.
+		 *    @access public
+		 */
+		function authenticate($username, $password) {
+			return $this->_failOnError(
+					$this->_browser->authenticate($username, $password));
+		}
+
+		/**
+		 *    Gets the cookie value for the current browser context.
+		 *    @param string $name          Name of cookie.
+		 *    @return string               Value of cookie or false if unset.
+		 *    @access public
+		 */
+		function getCookie($name) {
+			return $this->_browser->getCurrentCookieValue($name);
+		}
+
+		/**
+		 *    Sets a cookie in the current browser.
+		 *    @param string $name          Name of cookie.
+		 *    @param string $value         Cookie value.
+		 *    @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->_browser->setCookie($name, $value, $host, $path, $expiry);
+		}
+
+		/**
+		 *    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->_browser->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->_browser->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->_browser->setFrameFocus($name);
+		}
+
+		/**
+		 *    Clears the frame focus. All frames will be searched
+		 *    for content.
+		 *    @access public
+		 */
+		function clearFrameFocus() {
+			return $this->_browser->clearFrameFocus();
+		}
+
+		/**
+		 *    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) {
+			return $this->_failOnError($this->_browser->click($label));
+		}
+
+		/**
+		 *    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 values.
+		 *    @return boolean/string  Page on success, else false.
+		 *    @access public
+		 */
+		function clickSubmit($label = 'Submit', $additional = false) {
+			return $this->_failOnError(
+					$this->_browser->clickSubmit($label, $additional));
+		}
+
+		/**
+		 *    Clicks the submit button by name attribute. The owning
+		 *    form will be submitted by this.
+		 *    @param string $name     Name attribute of button.
+		 *    @param hash $additional Additional form values.
+		 *    @return boolean/string  Page on success.
+		 *    @access public
+		 */
+		function clickSubmitByName($name, $additional = false) {
+			return $this->_failOnError(
+					$this->_browser->clickSubmitByName($name, $additional));
+		}
+
+		/**
+		 *    Clicks the submit button by ID attribute. The owning
+		 *    form will be submitted by this.
+		 *    @param string $id       ID attribute of button.
+		 *    @param hash $additional Additional form values.
+		 *    @return boolean/string  Page on success.
+		 *    @access public
+		 */
+		function clickSubmitById($id, $additional = false) {
+			return $this->_failOnError(
+					$this->_browser->clickSubmitById($id, $additional));
+		}
+
+		/**
+		 *    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    Alt attribute of button.
+		 *    @param integer $x       X-coordinate of imaginary click.
+		 *    @param integer $y       Y-coordinate of imaginary click.
+		 *    @param hash $additional Additional form values.
+		 *    @return boolean/string  Page on success.
+		 *    @access public
+		 */
+		function clickImage($label, $x = 1, $y = 1, $additional = false) {
+			return $this->_failOnError(
+					$this->_browser->clickImage($label, $x, $y, $additional));
+		}
+
+		/**
+		 *    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 values.
+		 *    @return boolean/string  Page on success.
+		 *    @access public
+		 */
+		function clickImageByName($name, $x = 1, $y = 1, $additional = false) {
+			return $this->_failOnError(
+					$this->_browser->clickImageByName($name, $x, $y, $additional));
+		}
+
+		/**
+		 *    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 values.
+		 *    @return boolean/string      Page on success.
+		 *    @access public
+		 */
+		function clickImageById($id, $x = 1, $y = 1, $additional = false) {
+			return $this->_failOnError(
+					$this->_browser->clickImageById($id, $x, $y, $additional));
+		}
+
+		/**
+		 *    Submits a form by the ID.
+		 *    @param string $id       Form ID. No button information
+		 *                            is submitted this way.
+		 *    @return boolean/string  Page on success.
+		 *    @access public
+		 */
+		function submitFormById($id) {
+			return $this->_failOnError($this->_browser->submitFormById($id));
+		}
+
+		/**
+		 *    Follows a link by name. Will click the first link
+		 *    found with this link text by default, or a later
+		 *    one if an index is given. Match is case insensitive
+		 *    with normalised space.
+		 *    @param string $label     Text between the anchor tags.
+		 *    @param integer $index    Link position counting from zero.
+		 *    @return boolean/string   Page on success.
+		 *    @access public
+		 */
+		function clickLink($label, $index = 0) {
+			return $this->_failOnError($this->_browser->clickLink($label, $index));
+		}
+
+		/**
+		 *    Follows a link by id attribute.
+		 *    @param string $id        ID attribute value.
+		 *    @return boolean/string   Page on success.
+		 *    @access public
+		 */
+		function clickLinkById($id) {
+			return $this->_failOnError($this->_browser->clickLinkById($id));
+		}
+
+		/**
+		 *    Will trigger a pass if the two parameters have
+		 *    the same value only. Otherwise a fail. This
+		 *    is for testing hand extracted text, etc.
+		 *    @param mixed $first          Value to compare.
+		 *    @param mixed $second         Value to compare.
+		 *    @param string $message       Message to display.
+		 *    @return boolean              True on pass
+		 *    @access public
+		 */
+		function assertEqual($first, $second, $message = "%s") {
+			return $this->assert(
+					new EqualExpectation($first),
+					$second,
+					$message);
+		}
+
+		/**
+		 *    Will trigger a pass if the two parameters have
+		 *    a different value. Otherwise a fail. This
+		 *    is for testing hand extracted text, etc.
+		 *    @param mixed $first           Value to compare.
+		 *    @param mixed $second          Value to compare.
+		 *    @param string $message        Message to display.
+		 *    @return boolean               True on pass
+		 *    @access public
+		 */
+		function assertNotEqual($first, $second, $message = "%s") {
+			return $this->assert(
+					new NotEqualExpectation($first),
+					$second,
+					$message);
+		}
+
+		/**
+		 *    Tests for the presence of a link label. Match is
+		 *    case insensitive with normalised space.
+		 *    @param string $label     Text between the anchor tags.
+		 *    @param string $message   Message to display. Default
+		 *                             can be embedded with %s.
+		 *    @return boolean          True if link present.
+		 *    @access public
+		 */
+		function assertLink($label, $message = "%s") {
+			return $this->assertTrue(
+					$this->_browser->isLink($label),
+					sprintf($message, "Link [$label] should exist"));
+		}
+
+		/**
+		 *    Tests for the non-presence of a link label. Match is
+		 *    case insensitive with normalised space.
+		 *    @param string/integer $label    Text between the anchor tags
+		 *                                    or ID attribute.
+		 *    @param string $message          Message to display. Default
+		 *                                    can be embedded with %s.
+		 *    @return boolean                 True if link missing.
+		 *    @access public
+		 */
+		function assertNoLink($label, $message = "%s") {
+			return $this->assertFalse(
+					$this->_browser->isLink($label),
+					sprintf($message, "Link [$label] should not exist"));
+		}
+
+		/**
+		 *    Tests for the presence of a link id attribute.
+		 *    @param string $id        Id attribute value.
+		 *    @param string $message   Message to display. Default
+		 *                             can be embedded with %s.
+		 *    @return boolean          True if link present.
+		 *    @access public
+		 */
+		function assertLinkById($id, $message = "%s") {
+			return $this->assertTrue(
+					$this->_browser->isLinkById($id),
+					sprintf($message, "Link ID [$id] should exist"));
+		}
+
+		/**
+		 *    Tests for the non-presence of a link label. Match is
+		 *    case insensitive with normalised space.
+		 *    @param string $id        Id attribute value.
+		 *    @param string $message   Message to display. Default
+		 *                             can be embedded with %s.
+		 *    @return boolean          True if link missing.
+		 *    @access public
+		 */
+		function assertNoLinkById($id, $message = "%s") {
+			return $this->assertFalse(
+					$this->_browser->isLinkById($id),
+					sprintf($message, "Link ID [$id] should not exist"));
+		}
+
+		/**
+		 *    Sets all form fields with that label, or name if there
+		 *    is no label attached.
+		 *    @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 setField($label, $value) {
+			return $this->_browser->setField($label, $value);
+		}
+
+		/**
+		 *    Sets all form fields with that name.
+		 *    @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->_browser->setFieldByName($name, $value);
+		}
+
+		/**
+		 *    Sets all form fields with that name.
+		 *    @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->_browser->setFieldById($id, $value);
+		}
+
+		/**
+		 *    Confirms that the form element is currently set
+		 *    to the expected value. A missing form will always
+		 *    fail. If no value is given then only the existence
+		 *    of the field is checked.
+		 *    @param string $name       Name of field in forms.
+		 *    @param mixed $expected    Expected string/array value or
+		 *                              false for unset fields.
+		 *    @param string $message    Message to display. Default
+		 *                              can be embedded with %s.
+		 *    @return boolean           True if pass.
+		 *    @access public
+		 */
+		function assertField($label, $expected = true, $message = '%s') {
+			$value = $this->_browser->getField($label);
+			return $this->_assertFieldValue($label, $value, $expected, $message);
+		}
+
+		/**
+		 *    Confirms that the form element is currently set
+		 *    to the expected value. A missing form element will always
+		 *    fail. If no value is given then only the existence
+		 *    of the field is checked.
+		 *    @param string $name       Name of field in forms.
+		 *    @param mixed $expected    Expected string/array value or
+		 *                              false for unset fields.
+		 *    @param string $message    Message to display. Default
+		 *                              can be embedded with %s.
+		 *    @return boolean           True if pass.
+		 *    @access public
+		 */
+		function assertFieldByName($name, $expected = true, $message = '%s') {
+			$value = $this->_browser->getFieldByName($name);
+			return $this->_assertFieldValue($name, $value, $expected, $message);
+		}
+
+		/**
+		 *    Confirms that the form element is currently set
+		 *    to the expected value. A missing form will always
+		 *    fail. If no ID is given then only the existence
+		 *    of the field is checked.
+		 *    @param string/integer $id  Name of field in forms.
+		 *    @param mixed $expected     Expected string/array value or
+		 *                               false for unset fields.
+		 *    @param string $message     Message to display. Default
+		 *                               can be embedded with %s.
+		 *    @return boolean            True if pass.
+		 *    @access public
+		 */
+		function assertFieldById($id, $expected = true, $message = '%s') {
+			$value = $this->_browser->getFieldById($id);
+			return $this->_assertFieldValue($id, $value, $expected, $message);
+		}
+
+		/**
+		 *    Tests the field value against the expectation.
+		 *    @param string $identifier      Name, ID or label.
+		 *    @param mixed $value            Current field value.
+		 *    @param mixed $expected         Expected value to match.
+		 *    @param string $message         Failure message.
+		 *    @return boolean                True if pass
+		 *    @access protected
+		 */
+		function _assertFieldValue($identifier, $value, $expected, $message) {
+			if ($expected === true) {
+				return $this->assertTrue(
+						isset($value),
+						sprintf($message, "Field [$identifier] should exist"));
+			}
+			if (! SimpleExpectation::isExpectation($expected)) {
+				$identifier = str_replace('%', '%%', $identifier);
+				$expected = new FieldExpectation(
+						$expected,
+						"Field [$identifier] should match with [%s]");
+			}
+			return $this->assert($expected, $value, $message);
+		}
+
+		/**
+		 *    Checks the response code against a list
+		 *    of possible values.
+		 *    @param array $responses    Possible responses for a pass.
+		 *    @param string $message     Message to display. Default
+		 *                               can be embedded with %s.
+		 *    @return boolean            True if pass.
+		 *    @access public
+		 */
+		function assertResponse($responses, $message = '%s') {
+			$responses = (is_array($responses) ? $responses : array($responses));
+			$code = $this->_browser->getResponseCode();
+			$message = sprintf($message, "Expecting response in [" .
+					implode(", ", $responses) . "] got [$code]");
+			return $this->assertTrue(in_array($code, $responses), $message);
+		}
+
+		/**
+		 *    Checks the mime type against a list
+		 *    of possible values.
+		 *    @param array $types      Possible mime types for a pass.
+		 *    @param string $message   Message to display.
+		 *    @return boolean          True if pass.
+		 *    @access public
+		 */
+		function assertMime($types, $message = '%s') {
+			$types = (is_array($types) ? $types : array($types));
+			$type = $this->_browser->getMimeType();
+			$message = sprintf($message, "Expecting mime type in [" .
+					implode(", ", $types) . "] got [$type]");
+			return $this->assertTrue(in_array($type, $types), $message);
+		}
+
+		/**
+		 *    Attempt to match the authentication type within
+		 *    the security realm we are currently matching.
+		 *    @param string $authentication   Usually basic.
+		 *    @param string $message          Message to display.
+		 *    @return boolean                 True if pass.
+		 *    @access public
+		 */
+		function assertAuthentication($authentication = false, $message = '%s') {
+			if (! $authentication) {
+				$message = sprintf($message, "Expected any authentication type, got [" .
+						$this->_browser->getAuthentication() . "]");
+				return $this->assertTrue(
+						$this->_browser->getAuthentication(),
+						$message);
+			} else {
+				$message = sprintf($message, "Expected authentication [$authentication] got [" .
+						$this->_browser->getAuthentication() . "]");
+				return $this->assertTrue(
+						strtolower($this->_browser->getAuthentication()) == strtolower($authentication),
+						$message);
+			}
+		}
+
+		/**
+		 *    Checks that no authentication is necessary to view
+		 *    the desired page.
+		 *    @param string $message     Message to display.
+		 *    @return boolean            True if pass.
+		 *    @access public
+		 */
+		function assertNoAuthentication($message = '%s') {
+			$message = sprintf($message, "Expected no authentication type, got [" .
+					$this->_browser->getAuthentication() . "]");
+			return $this->assertFalse($this->_browser->getAuthentication(), $message);
+		}
+
+		/**
+		 *    Attempts to match the current security realm.
+		 *    @param string $realm     Name of security realm.
+		 *    @param string $message   Message to display.
+		 *    @return boolean          True if pass.
+		 *    @access public
+		 */
+		function assertRealm($realm, $message = '%s') {
+			if (! SimpleExpectation::isExpectation($realm)) {
+				$realm = new EqualExpectation($realm);
+			}
+			return $this->assert(
+					$realm,
+					$this->_browser->getRealm(),
+					"Expected realm -> $message");
+		}
+
+		/**
+		 *    Checks each header line for the required value. If no
+		 *    value is given then only an existence check is made.
+		 *    @param string $header    Case insensitive header name.
+		 *    @param mixed $value      Case sensitive trimmed string to
+		 *                             match against. An expectation object
+		 *                             can be used for pattern matching.
+		 *    @return boolean          True if pass.
+		 *    @access public
+		 */
+		function assertHeader($header, $value = false, $message = '%s') {
+			return $this->assert(
+					new HttpHeaderExpectation($header, $value),
+					$this->_browser->getHeaders(),
+					$message);
+		}
+
+		/**
+		 *    @deprecated
+		 */
+		function assertHeaderPattern($header, $pattern, $message = '%s') {
+			return $this->assert(
+					new HttpHeaderExpectation($header, new PatternExpectation($pattern)),
+					$this->_browser->getHeaders(),
+					$message);
+		}
+
+		/**
+		 *    Confirms that the header type has not been received.
+		 *    Only the landing page is checked. If you want to check
+		 *    redirect pages, then you should limit redirects so
+		 *    as to capture the page you want.
+		 *    @param string $header    Case insensitive header name.
+		 *    @return boolean          True if pass.
+		 *    @access public
+		 */
+		function assertNoHeader($header, $message = '%s') {
+			return $this->assert(
+					new NoHttpHeaderExpectation($header),
+					$this->_browser->getHeaders(),
+					$message);
+		}
+
+		/**
+		 *    @deprecated
+		 */
+		function assertNoUnwantedHeader($header, $message = '%s') {
+			return $this->assertNoHeader($header, $message);
+		}
+
+		/**
+		 *    Tests the text between the title tags.
+		 *    @param string $title      Expected title.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True if pass.
+		 *    @access public
+		 */
+		function assertTitle($title = false, $message = '%s') {
+			if (! SimpleExpectation::isExpectation($title)) {
+				$title = new EqualExpectation($title);
+			}
+			return $this->assert($title, $this->_browser->getTitle(), $message);
+		}
+
+		/**
+		 *    Will trigger a pass if the text is found in the plain
+		 *    text form of the page.
+		 *    @param string $text       Text to look for.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True if pass.
+		 *    @access public
+		 */
+		function assertText($text, $message = '%s') {
+			return $this->assert(
+					new TextExpectation($text),
+					$this->_browser->getContentAsText(),
+					$message);
+		}
+
+		/**
+		 *	  @deprecated
+		 */
+		function assertWantedText($text, $message = '%s') {
+			return $this->assertText($text, $message);
+		}
+
+		/**
+		 *    Will trigger a pass if the text is not found in the plain
+		 *    text form of the page.
+		 *    @param string $text       Text to look for.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True if pass.
+		 *    @access public
+		 */
+		function assertNoText($text, $message = '%s') {
+			return $this->assert(
+					new NoTextExpectation($text),
+					$this->_browser->getContentAsText(),
+					$message);
+		}
+
+		/**
+		 *	  @deprecated
+		 */
+		function assertNoUnwantedText($text, $message = '%s') {
+			return $this->assertNoText($text, $message);
+		}
+
+		/**
+		 *    Will trigger a pass if the Perl regex pattern
+		 *    is found in the raw content.
+		 *    @param string $pattern    Perl regex to look for including
+		 *                              the regex delimiters.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True if pass.
+		 *    @access public
+		 */
+		function assertPattern($pattern, $message = '%s') {
+			return $this->assert(
+					new PatternExpectation($pattern),
+					$this->_browser->getContent(),
+					$message);
+		}
+
+		/**
+		 *	  @deprecated
+		 */
+		function assertWantedPattern($pattern, $message = '%s') {
+			return $this->assertPattern($pattern, $message);
+		}
+
+		/**
+		 *    Will trigger a pass if the perl regex pattern
+		 *    is not present in raw content.
+		 *    @param string $pattern    Perl regex to look for including
+		 *                              the regex delimiters.
+		 *    @param string $message    Message to display.
+		 *    @return boolean           True if pass.
+		 *    @access public
+		 */
+		function assertNoPattern($pattern, $message = '%s') {
+			return $this->assert(
+					new NoPatternExpectation($pattern),
+					$this->_browser->getContent(),
+					$message);
+		}
+
+		/**
+		 *	  @deprecated
+		 */
+		function assertNoUnwantedPattern($pattern, $message = '%s') {
+			return $this->assertNoPattern($pattern, $message);
+		}
+
+		/**
+		 *    Checks that a cookie is set for the current page
+		 *    and optionally checks the value.
+		 *    @param string $name        Name of cookie to test.
+		 *    @param string $expected    Expected value as a string or
+		 *                               false if any value will do.
+		 *    @param string $message     Message to display.
+		 *    @return boolean            True if pass.
+		 *    @access public
+		 */
+		function assertCookie($name, $expected = false, $message = '%s') {
+			$value = $this->getCookie($name);
+			if (! $expected) {
+				return $this->assertTrue(
+						$value,
+						sprintf($message, "Expecting cookie [$name]"));
+			}
+			if (! SimpleExpectation::isExpectation($expected)) {
+				$expected = new EqualExpectation($expected);
+			}
+			return $this->assert($expected, $value, "Expecting cookie [$name] -> $message");
+		}
+
+		/**
+		 *    Checks that no cookie is present or that it has
+		 *    been successfully cleared.
+		 *    @param string $name        Name of cookie to test.
+		 *    @param string $message     Message to display.
+		 *    @return boolean            True if pass.
+		 *    @access public
+		 */
+		function assertNoCookie($name, $message = '%s') {
+			return $this->assertTrue(
+					$this->getCookie($name) === false,
+					sprintf($message, "Not expecting cookie [$name]"));
+		}
+	}
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -80,7 +80,7 @@ 
             if (is_array($compare) && count($compare) == 1) {
                 $compare = $compare[0];
             }
-            if (! $this->_isSingle($compare)) {
+            if (!$this->_isSingle($compare)) {
                 return false;
             }
             return ($this->_value == $compare);
@@ -96,7 +96,7 @@ 
             if (is_string($compare)) {
                 $compare = array($compare);
             }
-            if (! is_array($compare)) {
+            if (!is_array($compare)) {
                 return false;
             }
             sort($compare);
@@ -401,7 +401,7 @@ 
          *    @access public
          */
         function test($compare) {
-            return ! parent::test($compare);
+            return !parent::test($compare);
         }
 
         /**
@@ -622,7 +622,7 @@ 
          *    @access private
          */
         function _failOnError($result) {
-            if (! $this->_ignore_errors) {
+            if (!$this->_ignore_errors) {
                 if ($error = $this->_browser->getTransportError()) {
                     $this->fail($error);
                 }
@@ -648,7 +648,7 @@ 
          *    @access public
          */
         function setMaximumRedirects($max) {
-            if (! $this->_browser) {
+            if (!$this->_browser) {
                 trigger_error(
                         'Can only set maximum redirects in a test method, setUp() or tearDown()');
             }
@@ -1165,7 +1165,7 @@ 
                         isset($value),
                         sprintf($message, "Field [$identifier] should exist"));
             }
-            if (! SimpleExpectation::isExpectation($expected)) {
+            if (!SimpleExpectation::isExpectation($expected)) {
                 $identifier = str_replace('%', '%%', $identifier);
                 $expected = new FieldExpectation(
                         $expected,
@@ -1216,7 +1216,7 @@ 
          *    @access public
          */
         function assertAuthentication($authentication = false, $message = '%s') {
-            if (! $authentication) {
+            if (!$authentication) {
                 $message = sprintf($message, "Expected any authentication type, got [" .
                         $this->_browser->getAuthentication() . "]");
                 return $this->assertTrue(
@@ -1252,7 +1252,7 @@ 
          *    @access public
          */
         function assertRealm($realm, $message = '%s') {
-            if (! SimpleExpectation::isExpectation($realm)) {
+            if (!SimpleExpectation::isExpectation($realm)) {
                 $realm = new EqualExpectation($realm);
             }
             return $this->assert(
@@ -1319,7 +1319,7 @@ 
          *    @access public
          */
         function assertTitle($title = false, $message = '%s') {
-            if (! SimpleExpectation::isExpectation($title)) {
+            if (!SimpleExpectation::isExpectation($title)) {
                 $title = new EqualExpectation($title);
             }
             return $this->assert($title, $this->_browser->getTitle(), $message);
@@ -1427,12 +1427,12 @@ 
          */
         function assertCookie($name, $expected = false, $message = '%s') {
             $value = $this->getCookie($name);
-            if (! $expected) {
+            if (!$expected) {
                 return $this->assertTrue(
                         $value,
                         sprintf($message, "Expecting cookie [$name]"));
             }
-            if (! SimpleExpectation::isExpectation($expected)) {
+            if (!SimpleExpectation::isExpectation($expected)) {
                 $expected = new EqualExpectation($expected);
             }
             return $this->assert($expected, $value, "Expecting cookie [$name] -> $message");

tests/test_tools/simpletest/xml.php

Doc Comments -2 removed lines

@@ -130,8 +130,6 @@
         /**
          *    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();

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) {
+		}
+	}

Spacing +3 added lines, -3 removed lines

@@ -228,7 +228,7 @@ 
          *    @abstract
          */
         function paintHeader($test_name) {
-            if (! SimpleReporter::inCli()) {
+            if (!SimpleReporter::inCli()) {
                 header('Content-type: text/xml');
             }
             print "<?xml version=\"1.0\"";
@@ -428,7 +428,7 @@ 
         function getSize() {
             $attributes = $this->_getAttributes();
             if (isset($attributes['SIZE'])) {
-                return (integer)$attributes['SIZE'];
+                return (integer) $attributes['SIZE'];
             }
             return 0;
         }
@@ -471,7 +471,7 @@ 
          *    @access public
          */
         function parse($chunk) {
-            if (! xml_parse($this->_expat, $chunk)) {
+            if (!xml_parse($this->_expat, $chunk)) {
                 trigger_error('XML parse error with ' .
                         xml_error_string(xml_get_error_code($this->_expat)));
                 return false;

tests/unit/Collections/TPriorityListTest.php

Doc Comments +4 added lines

@@ -3,6 +3,10 @@
 class PriorityListItem
 {
 	var $data = 'data';
+
+	/**
+	 * @param integer $d
+	 */
 	function __construct($d)
 	{
 		$this->data = $d;

Spacing +44 added lines, -44 removed lines

@@ -75,7 +75,7 @@ 
 	public function testConstructTList()
 	{
 		$a    = array(
-			1,2,3
+			1, 2, 3
 		);
 		$list = new TPriorityList($a);
 		$this->assertEquals(3, $list->getCount());
@@ -241,7 +241,7 @@ 
 	public function testCanNotRemoveWhenReadOnlyTList()
 	{
 		$list = new TPriorityList(array(
-			1,2,3
+			1, 2, 3
 		), true);
 		try {
 			$list->remove(2);
@@ -251,7 +251,7 @@ 
 		}
 		
 		$list = new TPriorityList(array(
-			1,2,3
+			1, 2, 3
 		), true);
 		try {
 			$list->remove(10);
@@ -279,7 +279,7 @@ 
 	public function testCanNotRemoveAtWhenReadOnlyTList()
 	{
 		$list = new TPriorityList(array(
-			1,2,3
+			1, 2, 3
 		), true);
 		try {
 			$list->removeAt(2);
@@ -289,7 +289,7 @@ 
 		}
 		
 		$list = new TPriorityList(array(
-			1,2,3
+			1, 2, 3
 		), true);
 		try {
 			$list->removeAt(10);
@@ -310,7 +310,7 @@ 
 	public function testCanNotClearWhenReadOnlyTList()
 	{
 		$list = new TPriorityList(array(
-			1,2,3
+			1, 2, 3
 		), true);
 		try {
 			$list->clear();
@@ -338,7 +338,7 @@ 
 	public function testCopyFromTList()
 	{
 		$array = array(
-			$this->item3,$this->item1
+			$this->item3, $this->item1
 		);
 		$this->list->copyFrom($array);
 		$this->assertTrue(count($array) == 2 && $this->list[0] === $this->item3 && $this->list[1] === $this->item1);
@@ -353,7 +353,7 @@ 
 	public function testMergeWithTList()
 	{
 		$array = array(
-			$this->item3,$this->item1
+			$this->item3, $this->item1
 		);
 		$this->list->mergeWith($array);
 		$this->assertTrue($this->list->getCount() == 4 && $this->list[0] === $this->item1 && $this->list[3] === $this->item1);
@@ -408,33 +408,33 @@ 
 	public function testOffsetSetAddTList()
 	{
 		$list = new TPriorityList(array(
-			1,2,3
+			1, 2, 3
 		));
 		$list->offsetSet(null, 4);
 		self::assertEquals(array(
-			1,2,3,4
+			1, 2, 3, 4
 		), $list->toArray());
 	}
 	
 	public function testOffsetSetReplaceTList()
 	{
 		$list = new TPriorityList(array(
-			1,2,3
+			1, 2, 3
 		));
 		$list->offsetSet(1, 4);
 		self::assertEquals(array(
-			1,4,3
+			1, 4, 3
 		), $list->toArray());
 	}
 	
 	public function testOffsetUnsetTList()
 	{
 		$list = new TPriorityList(array(
-			1,2,3
+			1, 2, 3
 		));
 		$list->offsetUnset(1);
 		self::assertEquals(array(
-			1,3
+			1, 3
 		), $list->toArray());
 	}
 	
@@ -449,7 +449,7 @@ 
 	public function testConstructTPriorityList()
 	{
 		$a = array(
-			'a' => 1,'0.5' => 2,9 => 8
+			'a' => 1, '0.5' => 2, 9 => 8
 		);
 		
 		$list = new TPriorityList($a);
@@ -646,38 +646,38 @@ 
 		
 		$plist->insertAtIndexInPriority(4, false);
 		$this->assertEquals(array(
-			3,4
+			3, 4
 		), $plist->toArray());
 		$plist->insertAtIndexInPriority(5, 2);
 		$this->assertEquals(array(
-			3,4,5
+			3, 4, 5
 		), $plist->toArray());
 		
 		$plist->insertAtIndexInPriority(6, false, null);
 		$this->assertEquals(array(
-			3,4,5,6
+			3, 4, 5, 6
 		), $plist->toArray());
 		$plist->insertAtIndexInPriority(7, 5, null);
 		$this->assertEquals(array(
-			3,4,5,6,7
+			3, 4, 5, 6, 7
 		), $plist->toArray());
 		
 		$plist->insertAtIndexInPriority(8, false, 10);
 		$this->assertEquals(array(
-			3,4,5,6,7,8
+			3, 4, 5, 6, 7, 8
 		), $plist->toArray());
 		$plist->insertAtIndexInPriority(9, 7, 10);
 		$this->assertEquals(array(
-			3,4,5,6,7,8,9
+			3, 4, 5, 6, 7, 8, 9
 		), $plist->toArray());
 		
 		$plist->insertAtIndexInPriority(10, false, 100);
 		$this->assertEquals(array(
-			3,4,5,6,7,8,9,10
+			3, 4, 5, 6, 7, 8, 9, 10
 		), $plist->toArray());
 		$plist->insertAtIndexInPriority(11, 1, 100);
 		$this->assertEquals(array(
-			3,4,5,6,7,8,9,10,11
+			3, 4, 5, 6, 7, 8, 9, 10, 11
 		), $plist->toArray());
 		
 		$plist = new TPriorityList();
@@ -689,38 +689,38 @@ 
 		
 		$plist->insertAtIndexInPriority(4, false, null, true);
 		$this->assertEquals(array(
-			3,4
+			3, 4
 		), $plist->toArray());
 		$plist->insertAtIndexInPriority(5, 2, null, true);
 		$this->assertEquals(array(
-			3,4,5
+			3, 4, 5
 		), $plist->toArray());
 		
 		$plist->insertAtIndexInPriority(6, false, null, true);
 		$this->assertEquals(array(
-			3,4,5,6
+			3, 4, 5, 6
 		), $plist->toArray());
 		$plist->insertAtIndexInPriority(7, 5, null, true);
 		$this->assertEquals(array(
-			3,4,5,6,7
+			3, 4, 5, 6, 7
 		), $plist->toArray());
 		
 		$plist->insertAtIndexInPriority(8, false, 10, true);
 		$this->assertEquals(array(
-			3,4,5,6,7,8
+			3, 4, 5, 6, 7, 8
 		), $plist->toArray());
 		$plist->insertAtIndexInPriority(9, 7, 10, true);
 		$this->assertEquals(array(
-			3,4,5,6,7,8,9
+			3, 4, 5, 6, 7, 8, 9
 		), $plist->toArray());
 		
 		$plist->insertAtIndexInPriority(10, false, 100, true);
 		$this->assertEquals(array(
-			3,4,5,6,7,8,9,10
+			3, 4, 5, 6, 7, 8, 9, 10
 		), $plist->toArray());
 		$plist->insertAtIndexInPriority(11, 1, 100, true);
 		$this->assertEquals(array(
-			3,4,5,6,7,8,9,10,11
+			3, 4, 5, 6, 7, 8, 9, 10, 11
 		), $plist->toArray());
 		
 		$plist = new TPriorityList();
@@ -732,38 +732,38 @@ 
 		
 		$plist->insertAtIndexInPriority(4, false, null, false);
 		$this->assertEquals(array(
-			3,4
+			3, 4
 		), $plist->toArray());
 		$plist->insertAtIndexInPriority(5, 2, null, false);
 		$this->assertEquals(array(
-			3,4,5
+			3, 4, 5
 		), $plist->toArray());
 		
 		$plist->insertAtIndexInPriority(6, false, null, false);
 		$this->assertEquals(array(
-			3,4,5,6
+			3, 4, 5, 6
 		), $plist->toArray());
 		$plist->insertAtIndexInPriority(7, 5, null, false);
 		$this->assertEquals(array(
-			3,4,5,6,7
+			3, 4, 5, 6, 7
 		), $plist->toArray());
 		
 		$plist->insertAtIndexInPriority(8, false, 10, false);
 		$this->assertEquals(array(
-			3,4,5,6,7,8
+			3, 4, 5, 6, 7, 8
 		), $plist->toArray());
 		$plist->insertAtIndexInPriority(9, 7, 10, false);
 		$this->assertEquals(array(
-			3,4,5,6,7,8,9
+			3, 4, 5, 6, 7, 8, 9
 		), $plist->toArray());
 		
 		$plist->insertAtIndexInPriority(10, false, 100, false);
 		$this->assertEquals(array(
-			3,4,5,6,7,8,9,10
+			3, 4, 5, 6, 7, 8, 9, 10
 		), $plist->toArray());
 		$plist->insertAtIndexInPriority(11, 1, 100, false);
 		$this->assertEquals(array(
-			3,4,5,6,7,8,9,10,11
+			3, 4, 5, 6, 7, 8, 9, 10, 11
 		), $plist->toArray());
 	}
 	
@@ -921,7 +921,7 @@ 
 	public function testMergeWithTPriorityList()
 	{
 		$plist = new TPriorityList(array(
-			$this->item3,$this->item1
+			$this->item3, $this->item1
 		));
 		$plist->mergeWith($this->plist);
 		$this->assertEquals(6, $plist->getCount());
@@ -1087,7 +1087,7 @@ 
 		$list->add(3, 15);
 		$list->offsetSet(null, 4); // Appending like this, items get the default priority; not linear behavior
 		self::assertEquals(array(
-			1,2,4,3
+			1, 2, 4, 3
 		), $list->toArray());
 	}
 	
@@ -1099,7 +1099,7 @@ 
 		$list->add(3, 15);
 		$list->offsetSet(1, 4);
 		self::assertEquals(array(
-			1,4,3
+			1, 4, 3
 		), $list->toArray());
 	}
 	
@@ -1111,7 +1111,7 @@ 
 		$list->add(3, 15);
 		$list->offsetSet(3, 4);
 		self::assertEquals(array(
-			1,2,3,4
+			1, 2, 3, 4
 		), $list->toArray());
 	}
 	
@@ -1123,7 +1123,7 @@ 
 		$list->add(3, 15);
 		$list->offsetUnset(1);
 		self::assertEquals(array(
-			1,3
+			1, 3
 		), $list->toArray());
 	}
 	

Braces +48 added lines, -72 removed lines

@@ -117,8 +117,7 @@ 
 		try {
 			$list->add(1);
 			self::fail('An expected TInvalidOperationException was not raised');
-		}
-		catch (TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 	}
 	
@@ -132,8 +131,7 @@ 
 		try {
 			$this->list->insertAt(4, $this->item3);
 			$this->fail('exception not raised when adding item at an out-of-range index');
-		}
-		catch (TInvalidDataValueException $e) {
+		} catch (TInvalidDataValueException $e) {
 		}
 	}
 	
@@ -143,14 +141,12 @@ 
 		try {
 			$list->insertAt(1, 2);
 			self::fail('An expected TInvalidOperationException was not raised');
-		}
-		catch (TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 		try {
 			$list->insertAt(0, 2);
 			self::fail('An expected TInvalidOperationException was not raised');
-		}
-		catch (TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 	}
 	
@@ -159,8 +155,7 @@ 
 		try {
 			$this->list->insertBefore($this->item4, $this->item3);
 			$this->fail('exception not raised when adding item before a non-existant base item');
-		}
-		catch (TInvalidDataValueException $e) {
+		} catch (TInvalidDataValueException $e) {
 		}
 		$this->assertEquals(2, $this->list->getCount());
 		$this->assertEquals(0, $this->list->insertBefore($this->item1, $this->item3));
@@ -178,14 +173,12 @@ 
 		try {
 			$list->insertBefore(5, 6);
 			self::fail('An expected TInvalidOperationException was not raised');
-		}
-		catch (TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 		try {
 			$list->insertBefore(8, 6);
 			self::fail('An expected TInvalidOperationException was not raised');
-		}
-		catch (TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 	}
 	
@@ -194,8 +187,7 @@ 
 		try {
 			$this->list->insertAfter($this->item4, $this->item3);
 			$this->fail('exception not raised when adding item after a non-existant base item');
-		}
-		catch (TInvalidDataValueException $e) {
+		} catch (TInvalidDataValueException $e) {
 		}
 		$this->assertEquals(2, $this->list->getCount());
 		$this->assertEquals(2, $this->list->insertAfter($this->item2, $this->item3));
@@ -213,14 +205,12 @@ 
 		try {
 			$list->insertAfter(5, 6);
 			self::fail('An expected TInvalidOperationException was not raised');
-		}
-		catch (TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 		try {
 			$list->insertAfter(8, 6);
 			self::fail('An expected TInvalidOperationException was not raised');
-		}
-		catch (TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 	}
 	
@@ -233,8 +223,7 @@ 
 		try {
 			$this->list->remove($this->item1);
 			$this->fail('exception not raised when removing nonexisting item');
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 		}
 	}
 	
@@ -246,8 +235,7 @@ 
 		try {
 			$list->remove(2);
 			self::fail('An expected TInvalidOperationException was not raised');
-		}
-		catch (TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 		
 		$list = new TPriorityList(array(
@@ -256,8 +244,7 @@ 
 		try {
 			$list->remove(10);
 			self::fail('An expected TInvalidOperationException was not raised');
-		}
-		catch (TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 	}
 	
@@ -271,8 +258,7 @@ 
 		try {
 			$this->list->removeAt(2);
 			$this->fail('exception not raised when removing item with invalid index');
-		}
-		catch (TInvalidDataValueException $e) {
+		} catch (TInvalidDataValueException $e) {
 		}
 	}
 	
@@ -284,8 +270,7 @@ 
 		try {
 			$list->removeAt(2);
 			self::fail('An expected TInvalidOperationException was not raised');
-		}
-		catch (TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 		
 		$list = new TPriorityList(array(
@@ -294,8 +279,7 @@ 
 		try {
 			$list->removeAt(10);
 			self::fail('An expected TInvalidOperationException was not raised');
-		}
-		catch (TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 	}
 	
@@ -314,8 +298,7 @@ 
 		), true);
 		try {
 			$list->clear();
-		}
-		catch (TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 			return;
 		}
 		self::fail('An expected TInvalidOperationException was not raised');
@@ -345,8 +328,7 @@ 
 		try {
 			$this->list->copyFrom($this);
 			$this->fail('exception not raised when copying from non-traversable object');
-		}
-		catch (TInvalidDataTypeException $e) {
+		} catch (TInvalidDataTypeException $e) {
 		}
 	}
 	
@@ -360,8 +342,7 @@ 
 		try {
 			$this->list->mergeWith($this);
 			$this->fail('exception not raised when copying from non-traversable object');
-		}
-		catch (TInvalidDataTypeException $e) {
+		} catch (TInvalidDataTypeException $e) {
 		}
 	}
 	
@@ -378,8 +359,7 @@ 
 		try {
 			$a = $this->list[2];
 			$this->fail('exception not raised when accessing item with out-of-range index');
-		}
-		catch (TInvalidDataValueException $e) {
+		} catch (TInvalidDataValueException $e) {
 		}
 	}
 	
@@ -390,10 +370,12 @@ 
 		foreach ($this->list as $index => $item) {
 			foreach ($this->list as $a => $b); // test of iterator
 			$n++;
-			if ($index === 0 && $item === $this->item1)
-				$found++;
-			if ($index === 1 && $item === $this->item2)
-				$found++;
+			if ($index === 0 && $item === $this->item1) {
+							$found++;
+			}
+			if ($index === 1 && $item === $this->item2) {
+							$found++;
+			}
 		}
 		$this->assertTrue($n == 2 && $found == 2);
 	}
@@ -552,8 +534,7 @@ 
 		try {
 			$plist->insertAt(5, $this->pitem3);
 			$this->fail('exception not raised when adding item at an out-of-range index');
-		}
-		catch (TInvalidDataValueException $e) {
+		} catch (TInvalidDataValueException $e) {
 		}
 		$this->assertEquals(100, $plist->priorityAt(4));
 	}
@@ -588,22 +569,19 @@ 
 		try {
 			$plist->remove($this->pitem5);
 			$this->fail('Exception not raised: TInvalidDataValueException: The item cannot be found in the list');
-		}
-		catch (TInvalidDataValueException $v) {
+		} catch (TInvalidDataValueException $v) {
 		}
 		
 		try {
 			$plist->remove($this->pitem3, null);
 			$this->fail('Exception not raised: TInvalidDataValueException: The item cannot be found in the list');
-		}
-		catch (TInvalidDataValueException $v) {
+		} catch (TInvalidDataValueException $v) {
 		}
 		
 		try {
 			$plist->remove($this->pitem1, 100);
 			$this->fail('Exception not raised: TInvalidDataValueException: The item cannot be found in the list');
-		}
-		catch (TInvalidDataValueException $v) {
+		} catch (TInvalidDataValueException $v) {
 		}
 		
 		$plist->insertBefore($this->pitem3, $this->pitem4);
@@ -621,8 +599,7 @@ 
 		try {
 			$plist->removeAt(3);
 			$this->fail('exception not raised when removing item with invalid index');
-		}
-		catch (TInvalidDataValueException $e) {
+		} catch (TInvalidDataValueException $e) {
 		}
 	}
 	
@@ -773,8 +750,7 @@ 
 		try {
 			$list->insertAtIndexInPriority(1);
 			self::fail('An expected TInvalidOperationException was not raised');
-		}
-		catch (TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 	}
 	
@@ -785,8 +761,7 @@ 
 		try {
 			$plist->removeAtIndexInPriority(1, 100);
 			$this->fail('TInvalidDataValueException not raised when accessing item with out-of-range index');
-		}
-		catch (TInvalidDataValueException $e) {
+		} catch (TInvalidDataValueException $e) {
 		}
 		$this->assertEquals($this->pitem2, $plist->removeAtIndexInPriority(1));
 		$this->assertEquals($this->pitem3, $plist->removeAtIndexInPriority(0, 100));
@@ -794,8 +769,7 @@ 
 		try {
 			$plist->removeAtIndexInPriority(0, 200);
 			$this->fail('TInvalidDataValueException not raised when accessing item with out-of-range index');
-		}
-		catch (TInvalidDataValueException $e) {
+		} catch (TInvalidDataValueException $e) {
 		}
 		$this->assertEquals($this->pfirst, $plist->removeAtIndexInPriority(0, -10000000));
 		$this->assertEquals(0, $plist->getCount());
@@ -808,8 +782,7 @@ 
 		try {
 			$plist->removeAtIndexInPriority(0);
 			self::fail('An expected TInvalidOperationException was not raised');
-		}
-		catch (TInvalidOperationException $e) {
+		} catch (TInvalidOperationException $e) {
 		}
 	}
 	
@@ -1043,8 +1016,7 @@ 
 		try {
 			$a = $this->plist[4];
 			$this->fail('exception not raised when accessing item with out-of-range index');
-		}
-		catch (TInvalidDataValueException $e) {
+		} catch (TInvalidDataValueException $e) {
 		}
 	}
 	
@@ -1057,14 +1029,18 @@ 
 		
 		foreach ($this->plist as $index => $item) {
 			$n++;
-			if ($index === 0 && $item === $this->pfirst)
-				$found++;
-			if ($index === 1 && $item === $this->pitem1)
-				$found++;
-			if ($index === 2 && $item === $this->pitem2)
-				$found++;
-			if ($index === 3 && $item === $this->pitem3)
-				$found++;
+			if ($index === 0 && $item === $this->pfirst) {
+							$found++;
+			}
+			if ($index === 1 && $item === $this->pitem1) {
+							$found++;
+			}
+			if ($index === 2 && $item === $this->pitem2) {
+							$found++;
+			}
+			if ($index === 3 && $item === $this->pitem3) {
+							$found++;
+			}
 		}
 		$this->assertTrue($n == 4 && $found == 4);
 	}

tests/unit/TComponentTest.php

Doc Comments +4 added lines

@@ -170,6 +170,10 @@
 	public function isinstanceof($class, $instance=null) {
 		return $this->_instanceReturn;
 	}
+
+	/**
+	 * @param null|boolean $value
+	 */
 	public function setInstanceReturn($value) {
 		$this->_instanceReturn = $value;
 	}

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

Spacing +188 added lines, -188 removed lines

@@ -20,7 +20,7 @@ 
   }
 
   public function setText($value) {
-    $this->_text=$value;
+    $this->_text = $value;
   }
 
   public function getReadOnlyProperty() {
@@ -32,22 +32,22 @@ 
   }
 
   public function getObject() {
-    if(!$this->_object) {
-      $this->_object=new NewComponent;
-      $this->_object->_text='object text';
+    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;
+  public function myEventHandler($sender, $param) {
+    $this->_eventHandled = true;
   }
 
-  public function eventReturnValue($sender,$param) {
+  public function eventReturnValue($sender, $param) {
     return $param->Return;
   }
 
@@ -95,22 +95,22 @@ 
 		return $this->_callorder;
 	}
 	public function __dycall($method, $args) {
-		if(strncasecmp($method,'fx',2)!==0) return;
+		if (strncasecmp($method, 'fx', 2) !== 0) return;
 		$this->_callorder[] = 'fxcall';
 	}
-	public function fxGlobalListener($sender,$param,$name) {
+	public function fxGlobalListener($sender, $param, $name) {
 		$this->_callorder[] = 'fxGL';
 	}
-	public function fxPrimaryGlobalEvent($sender,$param,$name) {
+	public function fxPrimaryGlobalEvent($sender, $param, $name) {
 		$this->_callorder[] = 'primary';
 	}
-	public function commonRaiseEventListener($sender,$param,$name) {
+	public function commonRaiseEventListener($sender, $param, $name) {
 		$this->_callorder[] = 'com';
 	}
-	public function postglobalRaiseEventListener($sender,$param,$name) {
+	public function postglobalRaiseEventListener($sender, $param, $name) {
 		$this->_callorder[] = 'postgl';
 	}
-	public function preglobalRaiseEventListener($sender,$param,$name) {
+	public function preglobalRaiseEventListener($sender, $param, $name) {
 		$this->_callorder[] = 'pregl';
 	}
 }
@@ -123,7 +123,7 @@ 
 		$this->_baseObject = $object;
 		return $laa * $sol;
 	}
-	public function getLastClassObject() {return $this->_baseObject;}
+	public function getLastClassObject() {return $this->_baseObject; }
 }
 
 class FooFooClassBehavior extends FooClassBehavior {
@@ -164,10 +164,10 @@ 
 	private $_instanceReturn = null;
 
 	public function moreFunction($laa, $sol) {
-		return pow($laa+$sol+1, 2);
+		return pow($laa + $sol + 1, 2);
 	}
 
-	public function isinstanceof($class, $instance=null) {
+	public function isinstanceof($class, $instance = null) {
 		return $this->_instanceReturn;
 	}
 	public function setInstanceReturn($value) {
@@ -176,14 +176,14 @@ 
 }
 class DynamicCallComponent extends NewComponent implements IDynamicMethods {
 	public function __dycall($method, $args) {
-		if($method === 'dyPowerFunction')
+		if ($method === 'dyPowerFunction')
 			return pow($args[0], $args[1]);
-		if($method === 'dyDivisionFunction')
+		if ($method === 'dyDivisionFunction')
 			return $args[0] / $args[1];
-		if($method === 'fxPowerFunction')
-			return 2*pow($args[0], $args[1]);
-		if($method === 'fxDivisionFunction')
-			return 2*$args[0] / $args[1];
+		if ($method === 'fxPowerFunction')
+			return 2 * pow($args[0], $args[1]);
+		if ($method === 'fxDivisionFunction')
+			return 2 * $args[0] / $args[1];
 	}
 }
 
@@ -201,8 +201,8 @@ 
 		return true;
 	}
 
-	public function onBehaviorEvent($sender, $param,$responsetype=null,$postfunction=null) {
-    	return $this->getOwner()->raiseEvent('onBehaviorEvent',$sender,$param,$responsetype,$postfunction);
+	public function onBehaviorEvent($sender, $param, $responsetype = null, $postfunction = null) {
+    	return $this->getOwner()->raiseEvent('onBehaviorEvent', $sender, $param, $responsetype, $postfunction);
 	}
 	public function fxGlobalBehaviorEvent($sender, $param) {
 	}
@@ -294,22 +294,22 @@ 
 
 		return $chain->dyUnlisten($fx);
 	}
-	public function dyPreRaiseEvent($name,$sender,$param,$responsetype,$postfunction, $chain) {
+	public function dyPreRaiseEvent($name, $sender, $param, $responsetype, $postfunction, $chain) {
 		$this->lastCall = 3;
 		$this->arglist = func_get_args();
 
-		return $chain->dyPreRaiseEvent($name);// Calls the next event, within a chain, if parameters are left off, they are filled in with
+		return $chain->dyPreRaiseEvent($name); // Calls the next event, within a chain, if parameters are left off, they are filled in with
 		//	 the original parameters passed to the dynamic event. Parameters can be passed if they are changed.
 	}
-	public function dyIntraRaiseEventTestHandler($handler,$sender,$param,$name, $chain) {
+	public function dyIntraRaiseEventTestHandler($handler, $sender, $param, $name, $chain) {
 		$this->lastCall += 4;
 		$this->arglist = func_get_args();
 	}
-	public function dyIntraRaiseEventPostHandler($name,$sender,$param,$handler, $chain) {
+	public function dyIntraRaiseEventPostHandler($name, $sender, $param, $handler, $chain) {
 		$this->lastCall += 5;
 		$this->arglist = func_get_args();
 	}
-	public function dyPostRaiseEvent($responses,$name,$sender,$param,$responsetype,$postfunction, $chain) {
+	public function dyPostRaiseEvent($responses, $name, $sender, $param, $responsetype, $postfunction, $chain) {
 		$this->lastCall += 6;
 		$this->arglist = func_get_args();
 	}
@@ -332,11 +332,11 @@ 
 		$this->lastCall = 10;
 		$this->arglist = func_get_args();
 	}
-	public function dyAttachBehavior($name,$behavior, $chain) {
+	public function dyAttachBehavior($name, $behavior, $chain) {
 		$this->lastCall = 11;
 		$this->arglist = func_get_args();
 	}
-	public function dyDetachBehavior($name,$behavior, $chain) {
+	public function dyDetachBehavior($name, $behavior, $chain) {
 		$this->lastCall = 12;
 		$this->arglist = func_get_args();
 	}
@@ -348,11 +348,11 @@ 
 		$this->lastCall = 14;
 		$this->arglist = func_get_args();
 	}
-	public function dyEnableBehavior($name,$behavior, $chain) {
+	public function dyEnableBehavior($name, $behavior, $chain) {
 		$this->lastCall = 15;
 		$this->arglist = func_get_args();
 	}
-	public function dyDisableBehavior($name,$behavior, $chain) {
+	public function dyDisableBehavior($name, $behavior, $chain) {
 		$this->lastCall = 16;
 		$this->arglist = func_get_args();
 	}
@@ -370,11 +370,11 @@ 
 	}
 	public function __dycall($method, $args) {
 		$this->_dyMethod = $method;
-		if($method == 'dyTestDynamicBehaviorMethod')
+		if ($method == 'dyTestDynamicBehaviorMethod')
 			return $args[0] / $args[1];
 	}
 	public function dyTestIntraEvent($param1, $param2, $chain) {
-		return $chain->dyTestIntraEvent($param1*2*$param2, $param2);
+		return $chain->dyTestIntraEvent($param1 * 2 * $param2, $param2);
 	}
 	public function TestBehaviorMethod($param1, $param2) {
 		return $param1 * $param2;
@@ -391,11 +391,11 @@ 
 	public function __dycall($method, $args) {
 		$this->_dyMethod = $method;
 		$object = array_shift($args);
-		if($method == 'dyTestDynamicClassBehaviorMethod')
+		if ($method == 'dyTestDynamicClassBehaviorMethod')
 			return $args[0] / $args[1];
 	}
 	public function dyTestIntraEvent($object, $param1, $param2, $chain) {
-		return $chain->dyTestIntraEvent($param1*2*$param2, $param2);
+		return $chain->dyTestIntraEvent($param1 * 2 * $param2, $param2);
 	}
 	public function TestBehaviorMethod($object, $param1, $param2) {
 		return $param1 * $param2;
@@ -420,7 +420,7 @@ 
   public function tearDown() {
   	// 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)
+  	if ($this->component)
 	    $this->component->unlisten();
     $this->component = null;
   }
@@ -461,7 +461,7 @@ 
 	$this->assertEquals(25, $component->Bar->moreFunction(2, 2));
 	$this->assertEquals(8, $component->FooBar->moreFunction(2, 2));
 
-  	$component->unlisten();// unwind object and class behaviors
+  	$component->unlisten(); // unwind object and class behaviors
   	$this->component->detachClassBehavior('FooBar', 'NewComponent');
   	$this->component->detachClassBehavior('Bar', 'NewComponentNoListen');
 
@@ -545,7 +545,7 @@ 
     try {
       $this->component->attachClassBehavior('FooClassBehavior', new BarClassBehavior);
       $this->fail('TInvalidOperationException not raised when overwriting an existing behavior');
-    } catch(TInvalidOperationException $e) {
+    } catch (TInvalidOperationException $e) {
     }
 
 
@@ -553,7 +553,7 @@ 
     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) {
+    } catch (TInvalidOperationException $e) {
     }
 
 
@@ -815,7 +815,7 @@ 
     try {
 	  $this->component->faaEverMore(true, true);
       $this->fail('TApplicationException not raised trying to execute a undefined class method');
-    } catch(TApplicationException $e) {}
+    } catch (TApplicationException $e) {}
 
     $this->assertNull($this->component->asa('FooBehavior'));
     $this->assertFalse($this->component->isa('FooBehavior'));
@@ -825,7 +825,7 @@ 
     try {
       $this->component->attachBehavior('FooBehavior', new TComponent);
       $this->fail('TApplicationException not raised trying to execute a undefined class method');
-    } catch(TInvalidDataTypeException $e) {}
+    } catch (TInvalidDataTypeException $e) {}
 
     $this->component->attachBehavior('FooBehavior', new FooBehavior);
 
@@ -836,14 +836,14 @@ 
 
     try {
 	    $this->assertTrue($this->component->faaEverMore(true, true));
-    } catch(TApplicationException $e) {
+    } catch (TApplicationException $e) {
       $this->fail('TApplicationException raised while trying to execute a behavior class method');
     }
 
     try {
 	  $this->component->noMethodHere(true);
       $this->fail('TApplicationException not raised trying to execute a undefined class method');
-    } catch(TApplicationException $e) {}
+    } catch (TApplicationException $e) {}
 
     $this->assertTrue($this->component->disableBehavior('FooBehavior'));
 
@@ -853,7 +853,7 @@ 
     try {
 	  $this->component->faaEverMore(true, true);
       $this->fail('TApplicationException not raised trying to execute a undefined class method');
-    } catch(TApplicationException $e) {}
+    } catch (TApplicationException $e) {}
 
     $this->assertTrue($this->component->enableBehavior('FooBehavior'));
 
@@ -862,7 +862,7 @@ 
 
     try {
 	    $this->assertTrue($this->component->faaEverMore(true, true));
-    } catch(TApplicationException $e) {
+    } catch (TApplicationException $e) {
       $this->fail('TApplicationException raised while trying to execute a behavior class method');
     }
 
@@ -962,14 +962,14 @@ 
     try {
 	  $this->component->faaEverMore(true, true);
       $this->fail('TApplicationException not raised trying to execute a undefined class method');
-    } catch(TApplicationException $e) {}
+    } catch (TApplicationException $e) {}
 
     $this->component->attachBehavior('FooBehavior', new FooBehavior);
 
     $this->assertTrue($this->component->isa('FooBehavior'));
     try {
 	    $this->assertTrue($this->component->faaEverMore(true, true));
-    } catch(TApplicationException $e) {
+    } catch (TApplicationException $e) {
       $this->fail('TApplicationException raised while trying to execute a behavior class method');
     }
 
@@ -980,14 +980,14 @@ 
     try {
 	  $this->component->faaEverMore(true, true);
       $this->fail('TApplicationException not raised trying to execute a undefined class method');
-    } catch(TApplicationException $e) {}
+    } catch (TApplicationException $e) {}
 
     $this->assertTrue($this->component->enableBehavior('FooBehavior'));
 
     $this->assertTrue($this->component->isa('FooBehavior'));
     try {
 	    $this->assertTrue($this->component->faaEverMore(true, true));
-    } catch(TApplicationException $e) {
+    } catch (TApplicationException $e) {
       $this->fail('TApplicationException raised while trying to execute a behavior class method');
     }
 
@@ -999,7 +999,7 @@ 
     try {
 	  $this->component->moreFunction(true, true);
       $this->fail('TApplicationException not raised trying to execute an undefined class method');
-    } catch(TApplicationException $e) {}
+    } catch (TApplicationException $e) {}
 
     $this->component->attachClassBehavior('BarClassBehavior', new BarClassBehavior);
 
@@ -1008,7 +1008,7 @@ 
 
     try {
 	    $this->assertTrue($this->component->moreFunction(true, true));
-    } catch(TApplicationException $e) {
+    } catch (TApplicationException $e) {
       $this->fail('TApplicationException raised while trying to execute a behavior class method');
     }
 
@@ -1035,7 +1035,7 @@ 
     try {
 	    $this->assertNull($this->component->moreFunction(3, 4));
       	$this->fail('TApplicationException not raised trying to execute a disabled behavior');
-    } catch(TApplicationException $e) {}
+    } 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
@@ -1061,7 +1061,7 @@ 
     try {
     	$this->component->faafaaEverMore(3, 4);
       	$this->fail('TApplicationException not raised trying to execute a disabled behavior');
-    } catch(TApplicationException $e) {}
+    } catch (TApplicationException $e) {}
 
 
 
@@ -1174,18 +1174,18 @@ 
   }
 
   public function testGetProperty() {
-    $this->assertTrue('default'===$this->component->Text);
+    $this->assertTrue('default' === $this->component->Text);
     try {
-      $value2=$this->component->Caption;
+      $value2 = $this->component->Caption;
       $this->fail('exception not raised when getting undefined property');
-    } catch(TInvalidOperationException $e) {
+    } catch (TInvalidOperationException $e) {
     }
 
     $this->assertTrue($this->component->OnMyEvent instanceof TPriorityList);
     try {
-      $value2=$this->component->onUndefinedEvent;
+      $value2 = $this->component->onUndefinedEvent;
       $this->fail('exception not raised when getting undefined property');
-    } catch(TInvalidOperationException $e) {
+    } catch (TInvalidOperationException $e) {
     }
 
     //Without the function parenthesis, the function is _not_ called but the __get
@@ -1201,9 +1201,9 @@ 
     $this->component->enableBehaviors();
 
     try {
-      $value2=$this->component->Excitement;
+      $value2 = $this->component->Excitement;
       $this->fail('exception not raised when getting undefined property');
-    } catch(TInvalidOperationException $e) {
+    } catch (TInvalidOperationException $e) {
     }
 
     $this->component->attachBehavior('BehaviorTestBehavior', $behavior = new BehaviorTestBehavior);
@@ -1214,7 +1214,7 @@ 
     try {
       $this->assertEquals('faa', $this->component->Excitement);
       $this->fail('exception not raised when getting undefined property');
-    } catch(TInvalidOperationException $e) {
+    } catch (TInvalidOperationException $e) {
     }
 
     $this->component->enableBehaviors();
@@ -1226,13 +1226,13 @@ 
     try {
 	      $behavior = $this->component->BehaviorTestBehavior2;
 	      $this->fail('exception not raised when getting undefined property');
-	    } catch(TInvalidOperationException $e) {
+	    } catch (TInvalidOperationException $e) {
     }
 
     try {
       $this->assertEquals('faa', $this->component->Excitement);
       $this->fail('exception not raised when getting undefined property');
-    } catch(TInvalidOperationException $e) {
+    } catch (TInvalidOperationException $e) {
     }
     $this->component->enableBehavior('BehaviorTestBehavior');
     $this->assertEquals('faa', $this->component->getExcitement());
@@ -1244,39 +1244,39 @@ 
   }
 
   public function testSetProperty() {
-    $value='new value';
-    $this->component->Text=$value;
-    $text=$this->component->Text;
-    $this->assertTrue($value===$this->component->Text);
+    $value = 'new value';
+    $this->component->Text = $value;
+    $text = $this->component->Text;
+    $this->assertTrue($value === $this->component->Text);
     try {
-      $this->component->NewMember=$value;
+      $this->component->NewMember = $value;
       $this->fail('exception not raised when setting undefined property');
-    } catch(TInvalidOperationException $e) {
+    } 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) {
+    } 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) {
+    } 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) {
+    } catch (TInvalidOperationException $e) {
     }
 
     $this->assertEquals(0, $this->component->getEventHandlers('onMyEvent')->getCount());
-    $this->component->onMyEvent = array($this->component,'myEventHandler');
+    $this->component->onMyEvent = array($this->component, 'myEventHandler');
     $this->assertEquals(1, $this->component->getEventHandlers('onMyEvent')->getCount());
-    $this->component->onMyEvent[] = array($this->component,'Object.myEventHandler');
+    $this->component->onMyEvent[] = array($this->component, 'Object.myEventHandler');
     $this->assertEquals(2, $this->component->getEventHandlers('onMyEvent')->getCount());
 
     $this->component->getEventHandlers('onMyEvent')->clear();
@@ -1287,7 +1287,7 @@ 
     try {
       $this->component->Excitement = 'laa';
       $this->fail('exception not raised when getting undefined property');
-    } catch(TInvalidOperationException $e) {
+    } catch (TInvalidOperationException $e) {
     }
 
     $this->component->attachBehavior('BehaviorTestBehavior', $behavior1 = new BehaviorTestBehavior);
@@ -1302,7 +1302,7 @@ 
       $this->component->Excitement = false;
       $this->assertEquals(false, $this->component->Excitement);
       $this->fail('exception not raised when getting undefined property');
-    } catch(TInvalidOperationException $e) {
+    } catch (TInvalidOperationException $e) {
     }
 
     $this->component->enableBehaviors();
@@ -1315,7 +1315,7 @@ 
       $this->component->Excitement = false;
       $this->assertEquals(false, $this->component->Excitement);
       $this->fail('exception not raised when getting undefined property');
-    } catch(TInvalidOperationException $e) {
+    } catch (TInvalidOperationException $e) {
     }
     $this->component->enableBehavior('BehaviorTestBehavior');
     $this->component->Excitement = 'sol';
@@ -1341,9 +1341,9 @@ 
     $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->component->onBehaviorEvent = array($this->component, 'myEventHandler');
     $this->assertEquals(1, $this->component->BehaviorTestBehavior->getEventHandlers('onBehaviorEvent')->getCount());
-    $this->component->onBehaviorEvent[] = array($this->component,'Object.myEventHandler');
+    $this->component->onBehaviorEvent[] = array($this->component, 'Object.myEventHandler');
     $this->assertEquals(2, $this->component->BehaviorTestBehavior->getEventHandlers('onBehaviorEvent')->getCount());
 
     $this->component->BehaviorTestBehavior->getEventHandlers('onBehaviorEvent')->clear();
@@ -1366,10 +1366,10 @@ 
     $this->assertTrue(isset($this->component->BehaviorTestBehavior));
     $this->assertFalse(isset($this->component->onBehaviorEvent));
 
-    $this->component->attachEventHandler('onBehaviorEvent','foo');
+    $this->component->attachEventHandler('onBehaviorEvent', 'foo');
     $this->assertTrue(isset($this->component->onBehaviorEvent));
 
-    $this->component->attachEventHandler('onMyEvent','foo');
+    $this->component->attachEventHandler('onMyEvent', 'foo');
     $this->assertTrue(isset($this->component->onMyEvent));
 
     $this->assertTrue(isset($this->component->Excitement));
@@ -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);
@@ -1408,7 +1408,7 @@ 
   	try {
 	  	unset($this->component->Object);
     	$this->fail('TInvalidOperationException not raised when unsetting get only property');
-  	} catch(TInvalidOperationException $e) {}
+  	} catch (TInvalidOperationException $e) {}
 
     $this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
  	$this->assertTrue($this->component->asa('BehaviorTestBehavior') instanceof BehaviorTestBehavior);
@@ -1437,7 +1437,7 @@ 
   	try {
 	  	unset($this->component->ReadOnly);
     	$this->fail('TInvalidOperationException not raised when unsetting get only property');
-  	} catch(TInvalidOperationException $e) {}
+  	} catch (TInvalidOperationException $e) {}
 
   	$this->component->onBehaviorEvent = 'foo';
   	$this->assertEquals(1, count($this->component->onBehaviorEvent));
@@ -1453,12 +1453,12 @@ 
   }
 
   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() {
@@ -1492,11 +1492,11 @@ 
 
   public function testHasEventHandler() {
     $this->assertFalse($this->component->hasEventHandler('OnMyEvent'));
-    $this->component->attachEventHandler('OnMyEvent','foo');
+    $this->component->attachEventHandler('OnMyEvent', 'foo');
     $this->assertTrue($this->component->hasEventHandler('OnMyEvent'));
 
     $this->assertFalse($this->component->hasEventHandler('fxNonExistantGlobalEvent'));
-    $this->component->attachEventHandler('fxNonExistantGlobalEvent','foo');
+    $this->component->attachEventHandler('fxNonExistantGlobalEvent', 'foo');
     $this->assertTrue($this->component->hasEventHandler('fxNonExistantGlobalEvent'));
 
     //Test behavior events
@@ -1505,7 +1505,7 @@ 
     $this->assertFalse($this->component->hasEventHandler('onBehaviorEvent'));
     $this->assertFalse($this->component->BehaviorTestBehavior->hasEventHandler('onBehaviorEvent'));
 
-    $this->component->attachEventHandler('onBehaviorEvent','foo');
+    $this->component->attachEventHandler('onBehaviorEvent', 'foo');
     $this->assertTrue($this->component->hasEventHandler('onBehaviorEvent'));
 
     $this->component->disableBehavior('BehaviorTestBehavior');
@@ -1517,23 +1517,23 @@ 
   }
 
   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));
+    $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');
+      $list = $this->component->getEventHandlers('YourEvent');
       $this->fail('exception not raised when getting event handlers for undefined event');
-    } catch(TInvalidOperationException $e) {
+    } 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));
+    $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) {
+      $list = $this->component->getEventHandlers('fxSomeUndefinedGlobalEvent');
+    } catch (TInvalidOperationException $e) {
       $this->fail('exception raised when getting event handlers for universal global event');
     }
 
@@ -1541,43 +1541,43 @@ 
 
     //Test behavior events
     try {
-      $list=$this->component->getEventHandlers('onBehaviorEvent');
+      $list = $this->component->getEventHandlers('onBehaviorEvent');
       $this->fail('exception not raised when getting event handlers for undefined event');
-    } catch(TInvalidOperationException $e) {
+    } 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));
+    $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');
+      $list = $this->component->getEventHandlers('onBehaviorEvent');
       $this->fail('exception not raised when getting event handlers for undefined event');
-    } catch(TInvalidOperationException $e) {
+    } catch (TInvalidOperationException $e) {
     }
     $this->component->enableBehavior('BehaviorTestBehavior');
-    $this->assertTrue(($this->component->getEventHandlers('onBehaviorEvent') instanceof TPriorityList) && ($list->getCount()===1));
+    $this->assertTrue(($this->component->getEventHandlers('onBehaviorEvent') instanceof TPriorityList) && ($list->getCount() === 1));
 
   }
 
   public function testAttachEventHandler() {
 
-    $this->component->attachEventHandler('OnMyEvent','foo');
+    $this->component->attachEventHandler('OnMyEvent', 'foo');
     $this->assertEquals(1, $this->component->getEventHandlers('OnMyEvent')->getCount());
     try {
-      $this->component->attachEventHandler('YourEvent','foo');
+      $this->component->attachEventHandler('YourEvent', 'foo');
       $this->fail('exception not raised when attaching event handlers for undefined event');
-    } catch(TInvalidOperationException $e) {
+    } 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->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]);
@@ -1588,19 +1588,19 @@ 
 
     //Test attaching behavior events
     try {
-      $this->component->attachEventHandler('onBehaviorEvent','foo');
+      $this->component->attachEventHandler('onBehaviorEvent', 'foo');
       $this->fail('exception not raised when getting event handlers for undefined event');
-    } catch(TInvalidOperationException $e) {
+    } catch (TInvalidOperationException $e) {
     }
     $this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
 
-    $this->component->attachEventHandler('onBehaviorEvent','foo');
+    $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->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]);
@@ -1611,9 +1611,9 @@ 
 
     $this->component->disableBehavior('BehaviorTestBehavior');
     try {
-      $this->component->attachEventHandler('onBehaviorEvent','bar');
+      $this->component->attachEventHandler('onBehaviorEvent', 'bar');
       $this->fail('exception not raised when getting event handlers for undefined event');
-    } catch(TInvalidOperationException $e) {
+    } catch (TInvalidOperationException $e) {
     }
     $this->component->enableBehavior('BehaviorTestBehavior');
 
@@ -1621,17 +1621,17 @@ 
 
   public function testDetachEventHandler() {
 
-    $this->component->attachEventHandler('OnMyEvent','foo');
+    $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');
+    $this->component->detachEventHandler('OnMyEvent', 'foo');
     $list = $this->component->getEventHandlers('OnMyEvent');
     $this->assertEquals(4, $list->getCount());
 
@@ -1640,32 +1640,32 @@ 
     $this->assertEquals('foobarfoobar', $list[2]);
     $this->assertEquals('foopost', $list[3]);
 
-    $this->component->detachEventHandler('OnMyEvent','foopre', null);
+    $this->component->detachEventHandler('OnMyEvent', 'foopre', null);
     $this->assertEquals(4, $list->getCount());
 
-    $this->component->detachEventHandler('OnMyEvent','foopre', 5);
+    $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->component->attachEventHandler('onBehaviorEvent', 'foo');
       $this->fail('exception not raised when getting event handlers for undefined event');
-    } catch(TInvalidOperationException $e) {
+    } catch (TInvalidOperationException $e) {
     }
     $this->component->attachBehavior('BehaviorTestBehavior', new BehaviorTestBehavior);
 
-    $this->component->attachEventHandler('onBehaviorEvent','foo');
+    $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');
+    $this->component->detachEventHandler('onBehaviorEvent', 'foo');
     $list = $this->component->getEventHandlers('onBehaviorEvent');
     $this->assertEquals(4, $list->getCount());
 
@@ -1674,10 +1674,10 @@ 
     $this->assertEquals('foobarfoobar', $list[2]);
     $this->assertEquals('foopost', $list[3]);
 
-    $this->component->detachEventHandler('onBehaviorEvent','foopre', null);
+    $this->component->detachEventHandler('onBehaviorEvent', 'foopre', null);
     $this->assertEquals(4, $list->getCount());
 
-    $this->component->detachEventHandler('onBehaviorEvent','foopre', 5);
+    $this->component->detachEventHandler('onBehaviorEvent', 'foopre', 5);
     $this->assertEquals(3, $list->getCount());
   }
 
@@ -1685,13 +1685,13 @@ 
 
 
   public function testRaiseEvent() {
-    $this->component->attachEventHandler('OnMyEvent',array($this->component,'myEventHandler'));
+    $this->component->attachEventHandler('OnMyEvent', array($this->component, 'myEventHandler'));
     $this->assertFalse($this->component->isEventHandled());
-    $this->component->raiseEvent('OnMyEvent',$this,null);
+    $this->component->raiseEvent('OnMyEvent', $this, null);
     $this->assertTrue($this->component->isEventHandled());
-    $this->component->attachEventHandler('OnMyEvent',array($this->component,'Object.myEventHandler'));
+    $this->component->attachEventHandler('OnMyEvent', array($this->component, 'Object.myEventHandler'));
     $this->assertFalse($this->component->Object->isEventHandled());
-    $this->component->raiseEvent('OnMyEvent',$this,null);
+    $this->component->raiseEvent('OnMyEvent', $this, null);
     $this->assertTrue($this->component->Object->isEventHandled());
 
     $this->component->resetEventHandled();
@@ -1701,13 +1701,13 @@ 
     // Test a behavior on event
     $this->component->attachBehavior('test', new BehaviorTestBehavior);
 
-    $this->component->attachEventHandler('onBehaviorEvent',array($this->component,'myEventHandler'));
+    $this->component->attachEventHandler('onBehaviorEvent', array($this->component, 'myEventHandler'));
     $this->assertFalse($this->component->isEventHandled());
-    $this->component->raiseEvent('onBehaviorEvent',$this,null);
+    $this->component->raiseEvent('onBehaviorEvent', $this, null);
     $this->assertTrue($this->component->isEventHandled());
-    $this->component->attachEventHandler('onBehaviorEvent',array($this->component,'Object.myEventHandler'));
+    $this->component->attachEventHandler('onBehaviorEvent', array($this->component, 'Object.myEventHandler'));
     $this->assertFalse($this->component->Object->isEventHandled());
-    $this->component->raiseEvent('onBehaviorEvent',$this,null);
+    $this->component->raiseEvent('onBehaviorEvent', $this, null);
     $this->assertTrue($this->component->Object->isEventHandled());
 
     //test behavior enabled/disabled events
@@ -1717,14 +1717,14 @@ 
     $this->component->Object->resetEventHandled();
 
     try {
-    	$this->component->attachEventHandler('onBehaviorEvent',array($this->component,'myEventHandler'));
+    	$this->component->attachEventHandler('onBehaviorEvent', array($this->component, 'myEventHandler'));
       $this->fail('exception not raised when getting event handlers for undefined event');
-    } catch(TInvalidOperationException $e) {}
+    } catch (TInvalidOperationException $e) {}
     $this->assertFalse($this->component->isEventHandled());
     try {
-      $this->component->raiseEvent('onBehaviorEvent',$this,null);
+      $this->component->raiseEvent('onBehaviorEvent', $this, null);
       $this->fail('exception not raised when getting event handlers for undefined event');
-    } catch(TInvalidOperationException $e) {}
+    } catch (TInvalidOperationException $e) {}
     $this->assertFalse($this->component->isEventHandled());
 
     $this->component->enableBehavior('test');
@@ -1735,12 +1735,12 @@ 
 
     $this->assertFalse($this->component->isEventHandled());
     $this->assertFalse($this->component->Object->isEventHandled());
-    $this->assertEquals(array(), $this->component->onBehaviorEvent($this,$this->component));
+    $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);
+    $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']);
@@ -1752,7 +1752,7 @@ 
     $this->assertEquals(2, count($arr));
 
     // This tests without the default filtering-out of null
-    $arr=$this->component->onBehaviorEvent($this, $this->component, false);
+    $arr = $this->component->onBehaviorEvent($this, $this->component, false);
     $this->assertEquals(array(null, null), $arr);
 
 
@@ -1763,9 +1763,9 @@ 
     $this->component->onBehaviorEvent = array($this, 'returnValue1');
 
     // Test the per event post processing function
-    $arr=$this->component->onBehaviorEvent($this, $this->component, array($this, 'postEventFunction'));
+    $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'));
+    $arr = $this->component->onBehaviorEvent($this, $this->component, array($this, 'postEventFunction2'));
     $this->assertEquals(array(sin(4), sin(1)), $arr);
 
 
@@ -1774,7 +1774,7 @@ 
 
     $this->component->onBehaviorEvent = array($this, 'ffValue4');
     $this->component->onBehaviorEvent = array($this, 'ffValue2');
-    $arr=$this->component->onBehaviorEvent($this, 5, TEventResults::EVENT_RESULT_FEED_FORWARD);
+    $arr = $this->component->onBehaviorEvent($this, 5, TEventResults::EVENT_RESULT_FEED_FORWARD);
     $this->assertEquals(array(20, 40), $arr);
 
 
@@ -1783,16 +1783,16 @@ 
     //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);
+    $arr = $this->component->onBehaviorEvent($this, 5, TEventResults::EVENT_RESULT_FEED_FORWARD);
     $this->assertEquals(array(10, 40), $arr);
   }
 
-  public function returnValue1(){return 1;}
-  public function returnValue4(){return 4;}
-  public function postEventFunction($sender, $param, $caller, $response){return exp($response);}
-  public function postEventFunction2($sender, $param, $caller, $response){return sin($response);}
-  public function ffValue2($sender, $param){return $param*2;}
-  public function ffValue4($sender, $param){return $param*4;}
+  public function returnValue1() {return 1; }
+  public function returnValue4() {return 4; }
+  public function postEventFunction($sender, $param, $caller, $response) {return exp($response); }
+  public function postEventFunction2($sender, $param, $caller, $response) {return sin($response); }
+  public function ffValue2($sender, $param) {return $param * 2; }
+  public function ffValue4($sender, $param) {return $param * 4; }
 
 
   public function testGlobalEventListenerInRaiseEvent() {
@@ -1816,7 +1816,7 @@ 
     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
@@ -1851,7 +1851,7 @@ 
     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
@@ -1899,12 +1899,12 @@ 
 
 
   public function testEvaluateExpression() {
-    $expression="1+2";
-    $this->assertTrue(3===$this->component->evaluateExpression($expression));
+    $expression = "1+2";
+    $this->assertTrue(3 === $this->component->evaluateExpression($expression));
     try {
-      $button=$this->component->evaluateExpression('$this->button');
+      $button = $this->component->evaluateExpression('$this->button');
       $this->fail('exception not raised when evaluating an invalid exception');
-    } catch(Exception $e) {
+    } catch (Exception $e) {
     }
   }
 
@@ -1912,13 +1912,13 @@ 
 
 
   public function testEvaluateStatements() {
-    $statements='$a="test string"; echo $a;';
-    $this->assertEquals('test string',$this->component->evaluateStatements($statements));
+    $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);
+      $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) {
+    } catch (Exception $e) {
     }
   }
 
@@ -1944,7 +1944,7 @@ 
 
     $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');
@@ -1972,7 +1972,7 @@ 
 
     $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));
 
 
   }
@@ -2001,7 +2001,7 @@ 
     $this->assertEquals(3, $this->component->evaluateExpression('1+2'));
     $this->assertEquals(7, $this->component->IntraEvents->LastCall);
 
-    $statements='$a="test string"; echo $a;';
+    $statements = '$a="test string"; echo $a;';
     $this->assertEquals('test string', $this->component->evaluateStatements($statements));
     $this->assertEquals(8, $this->component->IntraEvents->LastCall);
 
@@ -2032,8 +2032,8 @@ 
     $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);

Braces +24 added lines, -15 removed lines

@@ -95,7 +95,9 @@ 
 		return $this->_callorder;
 	}
 	public function __dycall($method, $args) {
-		if(strncasecmp($method,'fx',2)!==0) return;
+		if(strncasecmp($method,'fx',2)!==0) {
+			return;
+		}
 		$this->_callorder[] = 'fxcall';
 	}
 	public function fxGlobalListener($sender,$param,$name) {
@@ -176,14 +178,18 @@ 
 }
 class DynamicCallComponent extends NewComponent implements IDynamicMethods {
 	public function __dycall($method, $args) {
-		if($method === 'dyPowerFunction')
-			return pow($args[0], $args[1]);
-		if($method === 'dyDivisionFunction')
-			return $args[0] / $args[1];
-		if($method === 'fxPowerFunction')
-			return 2*pow($args[0], $args[1]);
-		if($method === 'fxDivisionFunction')
-			return 2*$args[0] / $args[1];
+		if($method === 'dyPowerFunction') {
+					return pow($args[0], $args[1]);
+		}
+		if($method === 'dyDivisionFunction') {
+					return $args[0] / $args[1];
+		}
+		if($method === 'fxPowerFunction') {
+					return 2*pow($args[0], $args[1]);
+		}
+		if($method === 'fxDivisionFunction') {
+					return 2*$args[0] / $args[1];
+		}
 	}
 }
 
@@ -370,8 +376,9 @@ 
 	}
 	public function __dycall($method, $args) {
 		$this->_dyMethod = $method;
-		if($method == 'dyTestDynamicBehaviorMethod')
-			return $args[0] / $args[1];
+		if($method == 'dyTestDynamicBehaviorMethod') {
+					return $args[0] / $args[1];
+		}
 	}
 	public function dyTestIntraEvent($param1, $param2, $chain) {
 		return $chain->dyTestIntraEvent($param1*2*$param2, $param2);
@@ -391,8 +398,9 @@ 
 	public function __dycall($method, $args) {
 		$this->_dyMethod = $method;
 		$object = array_shift($args);
-		if($method == 'dyTestDynamicClassBehaviorMethod')
-			return $args[0] / $args[1];
+		if($method == 'dyTestDynamicClassBehaviorMethod') {
+					return $args[0] / $args[1];
+		}
 	}
 	public function dyTestIntraEvent($object, $param1, $param2, $chain) {
 		return $chain->dyTestIntraEvent($param1*2*$param2, $param2);
@@ -420,8 +428,9 @@ 
   public function tearDown() {
   	// 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();
+  	if($this->component) {
+  		    $this->component->unlisten();
+  	}
     $this->component = null;
   }