silverstripe / silverstripe-framework

thirdparty/simpletest/compatibility.php

Doc Comments +1 added lines, -1 removed lines

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

thirdparty/simpletest/cookies.php

Doc Comments -2 removed lines

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

thirdparty/simpletest/encoding.php

Doc Comments +1 added lines, -1 removed lines

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

thirdparty/simpletest/form.php

Doc Comments +3 added lines, -4 removed lines

@@ -87,8 +87,7 @@ 
      *    Combined action attribute with current location
      *    to get an absolute form target.
      *    @param string $action    Action attribute from form tag.
-     *    @param SimpleUrl $base   Page location.
-     *    @return SimpleUrl        Absolute form target.
+     * @param SimplePage $page
      */
     function _createAction($action, &$page) {
         if (($action === '') || ($action === false)) {
@@ -221,7 +220,7 @@ 
     
     /**
      *    Sets a widget value within the form.
-     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @param SimpleByName $selector   Criteria to apply.
      *    @param string $value              Value to input into the widget.
      *    @return boolean                   True if value is legal, false
      *                                      otherwise. If the field is not
@@ -293,7 +292,7 @@ 
     
     /**
      *    Gets the submit values for a selected button.
-     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @param SimpleByName $selector   Criteria to apply.
      *    @param hash $additional           Additional data for the form.
      *    @return SimpleEncoding            Submitted values or false
      *                                      if there is no such button

thirdparty/simpletest/http.php

Doc Comments +3 added lines, -13 removed lines

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

thirdparty/simpletest/page.php

Doc Comments +7 added lines, -7 removed lines

@@ -145,7 +145,7 @@ 
     /**
      *    Reads the raw content and send events
      *    into the page to be built.
-     *    @param $response SimpleHttpResponse  Fetched response.
+     *    @param TestSession_STResponseWrapper $response SimpleHttpResponse  Fetched response.
      *    @return SimplePage                   Newly parsed page.
      *    @access public
      */
@@ -170,8 +170,8 @@ 
 
     /**
      *    Creates the parser used with the builder.
-     *    @param $listener SimpleSaxListener   Target of parser.
-     *    @return SimpleSaxParser              Parser to generate
+     *    @param SimplePageBuilder $listener SimpleSaxListener   Target of parser.
+     *    @return SimpleHtmlSaxParser              Parser to generate
      *                                         events for the builder.
      *    @access protected
      */
@@ -406,7 +406,7 @@ 
 
     /**
      *    Original request as bytes sent down the wire.
-     *    @return mixed              Sent content.
+     *    @return string|false              Sent content.
      *    @access public
      */
     function getRequest() {
@@ -415,7 +415,7 @@ 
 
     /**
      *    Accessor for raw text of page.
-     *    @return string        Raw unparsed content.
+     *    @return boolean        Raw unparsed content.
      *    @access public
      */
     function getRaw() {
@@ -467,7 +467,7 @@ 
 
     /**
      *    Base URL if set via BASE tag page url otherwise
-     *    @return SimpleUrl        Base url.
+     *    @return boolean        Base url.
      *    @access public
      */
     function getBaseUrl() {
@@ -658,7 +658,7 @@ 
     /**
      *    Opens a frameset. A frameset may contain nested
      *    frameset tags.
-     *    @param SimpleFramesetTag $tag      Tag to accept.
+     *    @param SimpleTag $tag      Tag to accept.
      *    @access public
      */
     function acceptFramesetStart(&$tag) {

thirdparty/simpletest/parser.php

Doc Comments +9 added lines, -11 removed lines

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

thirdparty/simpletest/tag.php

Doc Comments +2 added lines

@@ -112,6 +112,7 @@ 
     /**
      *    Sets an attribute.
      *    @param string $label    Attribute name.
+     * @param string $value
      *    @return string $value   New attribute value.
      *    @access protected
      */
@@ -1300,6 +1301,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
      */

thirdparty/simpletest/url.php

Doc Comments +3 added lines, -2 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() {
@@ -469,6 +469,7 @@ 
      *    @param string/SimpleUrl $base       Base URL.
      *    @param string                       Absolute path.
      *    @access private
+     * @return string
      */
     function _extractAbsolutePath($base) {
         if ($this->getHost()) {