Menu
▾
▴
[Simpletest-devel] SF.net SVN: simpletest:[2011] simpletest/trunk
|
From: <pp...@us...> - 2011-04-29 08:22:55
|
Revision: 2011
http://simpletest.svn.sourceforge.net/simpletest/?rev=2011&view=rev
Author: pp11
Date: 2011-04-29 08:22:48 +0000 (Fri, 29 Apr 2011)
Log Message:
-----------
Fix for bug report n?\194?\176 2890622 : Please remove trailing whitespace from code - submitted by daniel hahler ( blueyed )
Modified Paths:
--------------
simpletest/trunk/arguments.php
simpletest/trunk/authentication.php
simpletest/trunk/autorun.php
simpletest/trunk/collector.php
simpletest/trunk/cookies.php
simpletest/trunk/default_reporter.php
simpletest/trunk/eclipse.php
simpletest/trunk/encoding.php
simpletest/trunk/errors.php
simpletest/trunk/http.php
simpletest/trunk/recorder.php
simpletest/trunk/reflection_php4.php
simpletest/trunk/reflection_php5.php
simpletest/trunk/remote.php
simpletest/trunk/scorer.php
simpletest/trunk/shell_tester.php
simpletest/trunk/simpletest.php
simpletest/trunk/tag.php
simpletest/trunk/url.php
simpletest/trunk/user_agent.php
simpletest/trunk/web_tester.php
Modified: simpletest/trunk/arguments.php
===================================================================
--- simpletest/trunk/arguments.php 2011-04-28 15:56:11 UTC (rev 2010)
+++ simpletest/trunk/arguments.php 2011-04-29 08:22:48 UTC (rev 2011)
@@ -13,7 +13,7 @@
*/
class SimpleArguments {
private $all = array();
-
+
/**
* Parses the command line arguments. The usual formats
* are supported:
@@ -32,7 +32,7 @@
$this->assign($key, $value);
}
}
-
+
/**
* Sets the value in the argments object. If multiple
* values are added under the same key, the key will
@@ -50,7 +50,7 @@
$this->all[$key][] = $value;
}
}
-
+
/**
* Extracts the next key and value from the argument list.
* @param array $arguments The remaining arguments to be parsed.
@@ -71,7 +71,7 @@
return array($matches[1], $this->nextNonFlagElseTrue($arguments));
}
}
-
+
/**
* Attempts to use the next argument as a value. It
* won't use what it thinks is a flag.
@@ -83,7 +83,7 @@
private function nextNonFlagElseTrue(&$arguments) {
return $this->valueIsNext($arguments) ? array_shift($arguments) : true;
}
-
+
/**
* Test to see if the next available argument is a valid value.
* If it starts with "-" or "--" it's a flag and doesn't count.
@@ -94,7 +94,7 @@
function valueIsNext($arguments) {
return isset($arguments[0]) && ! $this->isFlag($arguments[0]);
}
-
+
/**
* It's a flag if it starts with "-" or "--".
* @param string $argument Value to be tested.
@@ -103,7 +103,7 @@
function isFlag($argument) {
return strncmp($argument, '-', 1) == 0;
}
-
+
/**
* The arguments are available as individual member
* variables on the object.
@@ -120,7 +120,7 @@
}
return false;
}
-
+
/**
* The entire argument set as a hash.
* @return hash Each argument and it's value(s).
@@ -139,7 +139,7 @@
private $overview;
private $flag_sets = array();
private $explanations = array();
-
+
/**
* Sets up the top level explanation for the program.
* @param string $overview Summary of program.
@@ -147,7 +147,7 @@
function __construct($overview = '') {
$this->overview = $overview;
}
-
+
/**
* Adds the explanation for a group of flags that all
* have the same function.
@@ -161,7 +161,7 @@
$this->flag_sets[] = $flags;
$this->explanations[] = $explanation;
}
-
+
/**
* Generates the help text.
* @returns string The complete formatted text.
@@ -174,7 +174,7 @@
}
return $this->noDuplicateNewLines($text);
}
-
+
/**
* Works out the longest flag for formatting purposes.
* @param array $flag_sets The internal flag set list.
@@ -188,7 +188,7 @@
}
return $longest;
}
-
+
/**
* Generates the text for a single flag and it's alternate flags.
* @returns string Help text for that flag group.
@@ -201,7 +201,7 @@
}
return $text;
}
-
+
/**
* Generates the flag name including leading dashes.
* @param string $flag Just the name.
@@ -210,7 +210,7 @@
private function renderFlag($flag) {
return (strlen($flag) == 1 ? '-' : '--') . $flag;
}
-
+
/**
* Converts multiple new lines into a single new line.
* Just there to trap accidental duplicate new lines.
Modified: simpletest/trunk/authentication.php
===================================================================
--- simpletest/trunk/authentication.php 2011-04-28 15:56:11 UTC (rev 2010)
+++ simpletest/trunk/authentication.php 2011-04-29 08:22:48 UTC (rev 2011)
@@ -20,7 +20,7 @@
private $root;
private $username;
private $password;
-
+
/**
* Starts with the initial entry directory.
* @param string $type Authentication type for this
@@ -35,7 +35,7 @@
$this->username = false;
$this->password = false;
}
-
+
/**
* Adds another location to the realm.
* @param SimpleUrl $url Somewhere in realm.
@@ -44,7 +44,7 @@
function stretch($url) {
$this->root = $this->getCommonPath($this->root, $url->getPath());
}
-
+
/**
* Finds the common starting path.
* @param string $first Path to compare.
@@ -62,7 +62,7 @@
}
return implode('/', $first) . '/';
}
-
+
/**
* Sets the identity to try within this realm.
* @param string $username Username in authentication dialog.
@@ -73,7 +73,7 @@
$this->username = $username;
$this->password = $password;
}
-
+
/**
* Accessor for current identity.
* @return string Last succesful username.
@@ -82,7 +82,7 @@
function getUsername() {
return $this->username;
}
-
+
/**
* Accessor for current identity.
* @return string Last succesful password.
@@ -91,7 +91,7 @@
function getPassword() {
return $this->password;
}
-
+
/**
* Test to see if the URL is within the directory
* tree of the realm.
@@ -108,7 +108,7 @@
}
return false;
}
-
+
/**
* Tests to see if one string is a substring of
* another.
@@ -130,7 +130,7 @@
*/
class SimpleAuthenticator {
private $realms;
-
+
/**
* Clears the realms.
* @access public
@@ -138,7 +138,7 @@
function SimpleAuthenticator() {
$this->restartSession();
}
-
+
/**
* Starts with no realms set up.
* @access public
@@ -146,7 +146,7 @@
function restartSession() {
$this->realms = array();
}
-
+
/**
* Adds a new realm centered the current URL.
* Browsers privatey wildly on their behaviour in this
@@ -166,7 +166,7 @@
function addRealm($url, $type, $realm) {
$this->realms[$url->getHost()][$realm] = new SimpleRealm($type, $url);
}
-
+
/**
* Sets the current identity to be presented
* against that realm.
@@ -181,7 +181,7 @@
$this->realms[$host][$realm]->setIdentity($username, $password);
}
}
-
+
/**
* Finds the name of the realm by comparing URLs.
* @param SimpleUrl $url URL to test.
@@ -199,7 +199,7 @@
}
return false;
}
-
+
/**
* Presents the appropriate headers for this location.
* @param SimpleHttpRequest $request Request to modify.
@@ -218,7 +218,7 @@
}
$this->addBasicHeaders($request, $username, $password);
}
-
+
/**
* Presents the appropriate headers for this
* location for basic authentication.
Modified: simpletest/trunk/autorun.php
===================================================================
--- simpletest/trunk/autorun.php 2011-04-28 15:56:11 UTC (rev 2010)
+++ simpletest/trunk/autorun.php 2011-04-29 08:22:48 UTC (rev 2011)
@@ -26,7 +26,7 @@
return;
}
$result = run_local_tests();
- if (SimpleReporter::inCli()) {
+ if (SimpleReporter::inCli()) {
exit($result ? 0 : 1);
}
}
Modified: simpletest/trunk/collector.php
===================================================================
--- simpletest/trunk/collector.php 2011-04-28 15:56:11 UTC (rev 2010)
+++ simpletest/trunk/collector.php 2011-04-29 08:22:48 UTC (rev 2011)
@@ -71,7 +71,7 @@
}
$test->addFile($file);
}
-
+
/**
* Tests for hidden files so as to skip them. Currently
* only tests for Unix hidden files.
Modified: simpletest/trunk/cookies.php
===================================================================
--- simpletest/trunk/cookies.php 2011-04-28 15:56:11 UTC (rev 2010)
+++ simpletest/trunk/cookies.php 2011-04-29 08:22:48 UTC (rev 2011)
@@ -27,7 +27,7 @@
private $path;
private $expiry;
private $is_secure;
-
+
/**
* Constructor. Sets the stored values.
* @param string $name Cookie key.
@@ -49,7 +49,7 @@
}
$this->is_secure = $is_secure;
}
-
+
/**
* Sets the host. The cookie rules determine
* that the first two parts are taken for
@@ -67,7 +67,7 @@
}
return false;
}
-
+
/**
* Accessor for the truncated host to which this
* cookie applies.
@@ -77,7 +77,7 @@
function getHost() {
return $this->host;
}
-
+
/**
* Test for a cookie being valid for a host name.
* @param string $host Host to test against.
@@ -87,7 +87,7 @@
function isValidHost($host) {
return ($this->truncateHost($host) === $this->getHost());
}
-
+
/**
* Extracts just the domain part that determines a
* cookie's host validity.
@@ -104,7 +104,7 @@
}
return false;
}
-
+
/**
* Accessor for name.
* @return string Cookie key.
@@ -113,7 +113,7 @@
function getName() {
return $this->name;
}
-
+
/**
* Accessor for value. A deleted cookie will
* have an empty string for this.
@@ -123,7 +123,7 @@
function getValue() {
return $this->value;
}
-
+
/**
* Accessor for path.
* @return string Valid cookie path.
@@ -132,7 +132,7 @@
function getPath() {
return $this->path;
}
-
+
/**
* Tests a path to see if the cookie applies
* there. The test path must be longer or
@@ -147,7 +147,7 @@
$this->getPath(),
strlen($this->getPath())) == 0);
}
-
+
/**
* Accessor for expiry.
* @return string Expiry string.
@@ -159,7 +159,7 @@
}
return gmdate("D, d M Y H:i:s", $this->expiry) . " GMT";
}
-
+
/**
* Test to see if cookie is expired against
* the cookie format time or timestamp.
@@ -180,7 +180,7 @@
}
return ($this->expiry < $now);
}
-
+
/**
* Ages the cookie by the specified number of
* seconds.
@@ -192,7 +192,7 @@
$this->expiry -= $interval;
}
}
-
+
/**
* Accessor for the secure flag.
* @return boolean True if cookie needs SSL.
@@ -201,7 +201,7 @@
function isSecure() {
return $this->is_secure;
}
-
+
/**
* Adds a trailing and leading slash to the path
* if missing.
@@ -227,7 +227,7 @@
*/
class SimpleCookieJar {
private $cookies;
-
+
/**
* Constructor. Jar starts empty.
* @access public
@@ -235,7 +235,7 @@
function __construct() {
$this->cookies = array();
}
-
+
/**
* Removes expired and temporary cookies as if
* the browser was closed and re-opened.
@@ -258,7 +258,7 @@
}
$this->cookies = $surviving_cookies;
}
-
+
/**
* Ages all cookies in the cookie jar.
* @param integer $interval The old session is moved
@@ -272,7 +272,7 @@
$this->cookies[$i]->agePrematurely($interval);
}
}
-
+
/**
* Sets an additional cookie. If a cookie has
* the same name and path it is replaced.
@@ -290,7 +290,7 @@
}
$this->cookies[$this->findFirstMatch($cookie)] = $cookie;
}
-
+
/**
* Finds a matching cookie to write over or the
* first empty slot if none.
@@ -311,7 +311,7 @@
}
return count($this->cookies);
}
-
+
/**
* Reads the most specific cookie value from the
* browser cookies. Looks for the longest path that
@@ -335,7 +335,7 @@
}
return (isset($value) ? $value : false);
}
-
+
/**
* Tests cookie for matching against search
* criteria.
@@ -359,7 +359,7 @@
}
return true;
}
-
+
/**
* Uses a URL to sift relevant cookies by host and
* path. Results are list of strings of form "name=value".
Modified: simpletest/trunk/default_reporter.php
===================================================================
--- simpletest/trunk/default_reporter.php 2011-04-28 15:56:11 UTC (rev 2010)
+++ simpletest/trunk/default_reporter.php 2011-04-29 08:22:48 UTC (rev 2011)
@@ -59,7 +59,7 @@
}
}
}
-
+
/**
* Run only this test.
* @return string Test name to run.
@@ -67,7 +67,7 @@
function getTest() {
return $this->test;
}
-
+
/**
* Run only this test suite.
* @return string Test class name to run.
@@ -75,7 +75,7 @@
function getTestCase() {
return $this->case;
}
-
+
/**
* Output should be XML or not.
* @return boolean True if XML desired.
@@ -83,7 +83,7 @@
function isXml() {
return $this->xml;
}
-
+
/**
* Output should suppress skip messages.
* @return boolean True for no skips.
@@ -91,7 +91,7 @@
function noSkips() {
return $this->no_skips;
}
-
+
/**
* Output should be a help message. Disabled during XML mode.
* @return boolean True if help message desired.
@@ -99,7 +99,7 @@
function help() {
return $this->help && ! $this->xml;
}
-
+
/**
* Returns plain-text help message for command line runner.
* @return string String help message
@@ -117,7 +117,7 @@
HELP;
}
-
+
}
/**
@@ -128,7 +128,7 @@
* @subpackage UnitTester
*/
class DefaultReporter extends SimpleReporterDecorator {
-
+
/**
* Assembles the appropriate reporter for the environment.
*/
Modified: simpletest/trunk/eclipse.php
===================================================================
--- simpletest/trunk/eclipse.php 2011-04-28 15:56:11 UTC (rev 2010)
+++ simpletest/trunk/eclipse.php 2011-04-29 08:22:48 UTC (rev 2011)
@@ -1,6 +1,6 @@
<?php
/**
- * base include file for eclipse plugin
+ * base include file for eclipse plugin
* @package SimpleTest
* @subpackage Eclipse
* @version $Id$
@@ -16,12 +16,12 @@
/**#@-*/
/**
- * base reported class for eclipse plugin
+ * base reported class for eclipse plugin
* @package SimpleTest
* @subpackage Eclipse
*/
class EclipseReporter extends SimpleScorer {
-
+
/**
* Reporter to be run inside of Eclipse interface.
* @param object $listener Eclipse listener (?).
@@ -37,7 +37,7 @@
$this->error = false;
$this->fail = false;
}
-
+
/**
* Means to display human readable object comparisons.
* @return SimpleDumper Visual comparer.
@@ -45,7 +45,7 @@
function getDumper() {
return new SimpleDumper();
}
-
+
/**
* Localhost connection from Eclipse.
* @param integer $port Port to connect to Eclipse.
@@ -56,7 +56,7 @@
$tmplistener = &new SimpleSocket($host, $port, 5);
return $tmplistener;
}
-
+
/**
* Wraps the test in an output buffer.
* @param SimpleInvoker $invoker Current test runner.
@@ -67,7 +67,7 @@
$eclinvoker = &new EclipseInvoker($invoker, $this->listener);
return $eclinvoker;
}
-
+
/**
* C style escaping.
* @param string $raw String with backslashes, quotes and whitespace.
@@ -78,7 +78,7 @@
$replace = array('\\\\','\"','\/','\b','\f','\n','\r','\t');
return str_replace($needle, $replace, $raw);
}
-
+
/**
* Stash the first passing item. Clicking the test
* item goes to first pass.
@@ -91,7 +91,7 @@
}
$this->pass = true;
}
-
+
/**
* Stash the first failing item. Clicking the test
* item goes to first fail.
@@ -106,7 +106,7 @@
$this->listener->write('{status:"fail",message:"'.$this->message.'",group:"'.$this->group.'",case:"'.$this->case.'",method:"'.$this->method.'"}');
}
}
-
+
/**
* Stash the first error. Clicking the test
* item goes to first error.
@@ -120,8 +120,8 @@
$this->listener->write('{status:"error",message:"'.$this->message.'",group:"'.$this->group.'",case:"'.$this->case.'",method:"'.$this->method.'"}');
}
}
-
-
+
+
/**
* Stash the first exception. Clicking the test
* item goes to first message.
@@ -141,8 +141,8 @@
. '"}');
}
}
-
+
/**
* We don't display any special header.
* @param string $test_name First test top level
@@ -159,7 +159,7 @@
*/
function paintFooter($test_name) {
}
-
+
/**
* Paints nothing at the start of a test method, but stash
* the method name for later.
@@ -172,14 +172,14 @@
$this->error = false;
$this->method = $this->escapeVal($method);
}
-
+
/**
* Only send one message if the test passes, after that
* suppress the message.
* @param string $test_name Name of test that is ending.
* @access public
*/
- function paintMethodEnd($method){
+ function paintMethodEnd($method){
if ($this->fail || $this->error || ! $this->pass){
} else {
$this->listener->write(
@@ -188,7 +188,7 @@
$this->method . '"}');
}
}
-
+
/**
* Stashes the test case name for the later failure message.
* @param string $test_name Name of test or other label.
@@ -197,7 +197,7 @@
function paintCaseStart($case){
$this->case = $this->escapeVal($case);
}
-
+
/**
* Drops the name.
* @param string $test_name Name of test or other label.
@@ -206,7 +206,7 @@
function paintCaseEnd($case){
$this->case = "";
}
-
+
/**
* Stashes the name of the test suite. Starts test coverage
* if enabled.
@@ -218,7 +218,7 @@
$this->group = $this->escapeVal($group);
if ($this->cc){
if (extension_loaded('xdebug')){
- xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
+ xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
}
}
}
@@ -268,7 +268,7 @@
/**
* Invoker decorator for Eclipse. Captures output until
- * the end of the test.
+ * the end of the test.
* @package SimpleTest
* @subpackage Eclipse
*/
@@ -277,7 +277,7 @@
$this->listener = &$listener;
$this->SimpleInvokerDecorator($invoker);
}
-
+
/**
* Starts output buffering.
* @param string $method Test method to call.
Modified: simpletest/trunk/encoding.php
===================================================================
--- simpletest/trunk/encoding.php 2011-04-28 15:56:11 UTC (rev 2010)
+++ simpletest/trunk/encoding.php 2011-04-29 08:22:48 UTC (rev 2011)
@@ -5,7 +5,7 @@
* @subpackage WebTester
* @version $Id$
*/
-
+
/**#@+
* include other SimpleTest class files
*/
@@ -20,7 +20,7 @@
class SimpleEncodedPair {
private $key;
private $value;
-
+
/**
* Stashes the data for rendering later.
* @param string $key Form element name.
@@ -30,7 +30,7 @@
$this->key = $key;
$this->value = $value;
}
-
+
/**
* The pair as a single string.
* @return string Encoded pair.
@@ -39,7 +39,7 @@
function asRequest() {
return urlencode($this->key) . '=' . urlencode($this->value);
}
-
+
/**
* The MIME part as a string.
* @return string MIME part encoding.
@@ -51,7 +51,7 @@
$part .= "\r\n" . $this->value;
return $part;
}
-
+
/**
* Is this the value we are looking for?
* @param string $key Identifier.
@@ -61,7 +61,7 @@
function isKey($key) {
return $key == $this->key;
}
-
+
/**
* Is this the value we are looking for?
* @return string Identifier.
@@ -70,7 +70,7 @@
function getKey() {
return $this->key;
}
-
+
/**
* Is this the value we are looking for?
* @return string Content.
@@ -90,7 +90,7 @@
private $key;
private $content;
private $filename;
-
+
/**
* Stashes the data for rendering later.
* @param string $key Key to add value to.
@@ -102,7 +102,7 @@
$this->content = $content;
$this->filename = $filename;
}
-
+
/**
* The pair as a single string.
* @return string Encoded pair.
@@ -111,7 +111,7 @@
function asRequest() {
return '';
}
-
+
/**
* The MIME part as a string.
* @return string MIME part encoding.
@@ -125,7 +125,7 @@
$part .= "\r\n\r\n" . $this->content;
return $part;
}
-
+
/**
* Attempts to figure out the MIME type from the
* file extension and the content.
@@ -138,7 +138,7 @@
}
return 'application/octet-stream';
}
-
+
/**
* Tests each character is in the range 0-127.
* @param string $ascii String to test.
@@ -152,7 +152,7 @@
}
return true;
}
-
+
/**
* Is this the value we are looking for?
* @param string $key Identifier.
@@ -162,7 +162,7 @@
function isKey($key) {
return $key == $this->key;
}
-
+
/**
* Is this the value we are looking for?
* @return string Identifier.
@@ -171,7 +171,7 @@
function getKey() {
return $this->key;
}
-
+
/**
* Is this the value we are looking for?
* @return string Content.
@@ -190,7 +190,7 @@
*/
class SimpleEncoding {
private $request;
-
+
/**
* Starts empty.
* @param array $query Hash of parameters.
@@ -205,7 +205,7 @@
$this->clear();
$this->merge($query);
}
-
+
/**
* Empties the request of parameters.
* @access public
@@ -213,7 +213,7 @@
function clear() {
$this->request = array();
}
-
+
/**
* Adds a parameter to the query.
* @param string $key Key to add value to.
@@ -232,7 +232,7 @@
$this->addPair($key, $value);
}
}
-
+
/**
* Adds a new value into the request.
* @param string $key Key to add value to.
@@ -242,7 +242,7 @@
protected function addPair($key, $value) {
$this->request[] = new SimpleEncodedPair($key, $value);
}
-
+
/**
* Adds a MIME part to the query. Does nothing for a
* form encoded packet.
@@ -254,7 +254,7 @@
function attach($key, $content, $filename) {
$this->request[] = new SimpleAttachment($key, $content, $filename);
}
-
+
/**
* Adds a set of parameters to this query.
* @param array/SimpleQueryString $query Multiple values are
@@ -270,7 +270,7 @@
}
}
}
-
+
/**
* Accessor for single value.
* @return string/array False if missing, string
@@ -293,7 +293,7 @@
return $values;
}
}
-
+
/**
* Accessor for listing of pairs.
* @return array All pair objects.
@@ -302,7 +302,7 @@
function getAll() {
return $this->request;
}
-
+
/**
* Renders the query string as a URL encoded
* request part.
@@ -327,7 +327,7 @@
* @subpackage WebTester
*/
class SimpleGetEncoding extends SimpleEncoding {
-
+
/**
* Starts empty.
* @param array $query Hash of parameters.
@@ -338,7 +338,7 @@
function __construct($query = false) {
parent::__construct($query);
}
-
+
/**
* HTTP request method.
* @return string Always GET.
@@ -347,7 +347,7 @@
function getMethod() {
return 'GET';
}
-
+
/**
* Writes no extra headers.
* @param SimpleSocket $socket Socket to write to.
@@ -355,7 +355,7 @@
*/
function writeHeadersTo(&$socket) {
}
-
+
/**
* No data is sent to the socket as the data is encoded into
* the URL.
@@ -364,7 +364,7 @@
*/
function writeTo(&$socket) {
}
-
+
/**
* Renders the query string as a URL encoded
* request part for attaching to a URL.
@@ -382,7 +382,7 @@
* @subpackage WebTester
*/
class SimpleHeadEncoding extends SimpleGetEncoding {
-
+
/**
* Starts empty.
* @param array $query Hash of parameters.
@@ -393,7 +393,7 @@
function __construct($query = false) {
parent::__construct($query);
}
-
+
/**
* HTTP request method.
* @return string Always HEAD.
@@ -410,7 +410,7 @@
* @subpackage WebTester
*/
class SimpleDeleteEncoding extends SimpleGetEncoding {
-
+
/**
* Starts empty.
* @param array $query Hash of parameters.
@@ -421,7 +421,7 @@
function __construct($query = false) {
parent::__construct($query);
}
-
+
/**
* HTTP request method.
* @return string Always DELETE.
@@ -433,7 +433,7 @@
}
/**
- * Bundles an entity-body for transporting
+ * Bundles an entity-body for transporting
* a raw content payload with the request.
* @package SimpleTest
* @subpackage WebTester
@@ -441,7 +441,7 @@
class SimpleEntityEncoding extends SimpleEncoding {
private $content_type;
private $body;
-
+
function __construct($query = false, $content_type = false) {
$this->content_type = $content_type;
if (is_string($query)) {
@@ -451,7 +451,7 @@
parent::__construct($query);
}
}
-
+
/**
* Returns the media type of the entity body
* @return string
@@ -463,7 +463,7 @@
}
return $this->content_type;
}
-
+
/**
* Dispatches the form headers down the socket.
* @param SimpleSocket $socket Socket to write to.
@@ -473,7 +473,7 @@
$socket->write("Content-Length: " . (integer)strlen($this->encode()) . "\r\n");
$socket->write("Content-Type: " . $this->getContentType() . "\r\n");
}
-
+
/**
* Dispatches the form data down the socket.
* @param SimpleSocket $socket Socket to write to.
@@ -482,7 +482,7 @@
function writeTo(&$socket) {
$socket->write($this->encode());
}
-
+
/**
* Renders the request body
* @return Encoded entity body
@@ -500,7 +500,7 @@
* @subpackage WebTester
*/
class SimplePostEncoding extends SimpleEntityEncoding {
-
+
/**
* Starts empty.
* @param array $query Hash of parameters.
@@ -514,7 +514,7 @@
}
parent::__construct($query, $content_type);
}
-
+
function hasMoreThanOneLevel($query) {
foreach ($query as $key => $value) {
if (is_array($value)) {
@@ -538,10 +538,10 @@
if ($this->hasMoreThanOneLevel($query_)) {
$query_ = $this->rewriteArrayWithMultipleLevels($query_);
}
-
+
return $query_;
}
-
+
/**
* HTTP request method.
* @return string Always POST.
@@ -550,7 +550,7 @@
function getMethod() {
return 'POST';
}
-
+
/**
* Renders the query string as a URL encoded
* request part for attaching to a URL.
@@ -568,7 +568,7 @@
* @subpackage WebTester
*/
class SimplePutEncoding extends SimpleEntityEncoding {
-
+
/**
* Starts empty.
* @param array $query Hash of parameters.
@@ -579,7 +579,7 @@
function __construct($query = false, $content_type = false) {
parent::__construct($query, $content_type);
}
-
+
/**
* HTTP request method.
* @return string Always PUT.
@@ -598,7 +598,7 @@
*/
class SimpleMultipartEncoding extends SimplePostEncoding {
private $boundary;
-
+
/**
* Starts empty.
* @param array $query Hash of parameters.
@@ -610,7 +610,7 @@
parent::__construct($query);
$this->boundary = ($boundary === false ? uniqid('st') : $boundary);
}
-
+
/**
* Dispatches the form headers down the socket.
* @param SimpleSocket $socket Socket to write to.
@@ -620,7 +620,7 @@
$socket->write("Content-Length: " . (integer)strlen($this->encode()) . "\r\n");
$socket->write("Content-Type: multipart/form-data; boundary=" . $this->boundary . "\r\n");
}
-
+
/**
* Dispatches the form data down the socket.
* @param SimpleSocket $socket Socket to write to.
@@ -629,7 +629,7 @@
function writeTo(&$socket) {
$socket->write($this->encode());
}
-
+
/**
* Renders the query string as a URL encoded
* request part.
Modified: simpletest/trunk/errors.php
===================================================================
--- simpletest/trunk/errors.php 2011-04-28 15:56:11 UTC (rev 2010)
+++ simpletest/trunk/errors.php 2011-04-29 08:22:48 UTC (rev 2011)
@@ -43,7 +43,7 @@
restore_error_handler();
$queue->tally();
}
-
+
/**
* Wires up the error queue for a single test.
* @return SimpleErrorQueue Queue connected to the test.
@@ -120,7 +120,7 @@
$content = str_replace('%', '%%', $content);
$this->testLatestError($severity, $content, $filename, $line);
}
-
+
/**
* Any errors still in the queue are sent to the test
* case. Any unfulfilled expectations trigger failures.
Modified: simpletest/trunk/http.php
===================================================================
--- simpletest/trunk/http.php 2011-04-28 15:56:11 UTC (rev 2010)
+++ simpletest/trunk/http.php 2011-04-29 08:22:48 UTC (rev 2011)
@@ -22,7 +22,7 @@
*/
class SimpleRoute {
private $url;
-
+
/**
* Sets the target URL.
* @param SimpleUrl $url URL as object.
@@ -31,7 +31,7 @@
function __construct($url) {
$this->url = $url;
}
-
+
/**
* Resource name.
* @return SimpleUrl Current url.
@@ -40,7 +40,7 @@
function getUrl() {
return $this->url;
}
-
+
/**
* Creates the first line which is the actual request.
* @param string $method HTTP request method, usually GET.
@@ -51,7 +51,7 @@
return $method . ' ' . $this->url->getPath() .
$this->url->getEncodedRequest() . ' HTTP/1.0';
}
-
+
/**
* Creates the host part of the request.
* @return string Host line content.
@@ -64,7 +64,7 @@
}
return $line;
}
-
+
/**
* Opens a socket to the route.
* @param string $method HTTP request method, usually GET.
@@ -86,7 +86,7 @@
}
return $socket;
}
-
+
/**
* Factory for socket.
* @param string $scheme Protocol to use.
@@ -117,7 +117,7 @@
private $proxy;
private $username;
private $password;
-
+
/**
* Stashes the proxy address.
* @param SimpleUrl $url URL as object.
@@ -132,7 +132,7 @@
$this->username = $username;
$this->password = $password;
}
-
+
/**
* Creates the first line which is the actual request.
* @param string $method HTTP request method, usually GET.
@@ -147,7 +147,7 @@
return $method . ' ' . $scheme . '://' . $url->getHost() . $port .
$url->getPath() . $url->getEncodedRequest() . ' HTTP/1.0';
}
-
+
/**
* Creates the host part of the request.
* @param SimpleUrl $url URL as object.
@@ -159,7 +159,7 @@
$port = $this->proxy->getPort() ? $this->proxy->getPort() : 8080;
return "$host:$port";
}
-
+
/**
* Opens a socket to the route.
* @param string $method HTTP request method, usually GET.
@@ -199,7 +199,7 @@
private $encoding;
private $headers;
private $cookies;
-
+
/**
* Builds the socket request from the different pieces.
* These include proxy information, URL, cookies, headers,
@@ -215,7 +215,7 @@
$this->headers = array();
$this->cookies = array();
}
-
+
/**
* Dispatches the content to the route's socket.
* @param integer $timeout Connection timeout.
@@ -231,7 +231,7 @@
}
return $this->createResponse($socket);
}
-
+
/**
* Sends the headers.
* @param SimpleSocket $socket Open socket.
@@ -251,7 +251,7 @@
$socket->write("\r\n");
$encoding->writeTo($socket);
}
-
+
/**
* Adds a header line to the request.
* @param string $header_line Text of full header line.
@@ -260,7 +260,7 @@
function addHeaderLine($header_line) {
$this->headers[] = $header_line;
}
-
+
/**
* Reads all the relevant cookies from the
* cookie jar.
@@ -271,7 +271,7 @@
function readCookiesFromJar($jar, $url) {
$this->cookies = $jar->selectAsPairs($url);
}
-
+
/**
* Wraps the socket in a response parser.
* @param SimpleSocket $socket Responding socket.
@@ -302,7 +302,7 @@
private $cookies;
private $authentication;
private $realm;
-
+
/**
* Parses the incoming header block.
* @param string $headers Header block.
@@ -321,7 +321,7 @@
$this->parseHeaderLine($header_line);
}
}
-
+
/**
* Accessor for parsed HTTP protocol version.
* @return integer HTTP error code.
@@ -330,7 +330,7 @@
function getHttpVersion() {
return $this->http_version;
}
-
+
/**
* Accessor for raw header block.
* @return string All headers as raw string.
@@ -339,7 +339,7 @@
function getRaw() {
return $this->raw_headers;
}
-
+
/**
* Accessor for parsed HTTP error code.
* @return integer HTTP error code.
@@ -348,7 +348,7 @@
function getResponseCode() {
return (integer)$this->response_code;
}
-
+
/**
* Returns the redirected URL or false if
* no redirection.
@@ -358,7 +358,7 @@
function getLocation() {
return $this->location;
}
-
+
/**
* Test to see if the response is a valid redirect.
* @return boolean True if valid redirect.
@@ -368,7 +368,7 @@
return in_array($this->response_code, array(301, 302, 303, 307)) &&
(boolean)$this->getLocation();
}
-
+
/**
* Test to see if the response is an authentication
* challenge.
@@ -380,7 +380,7 @@
(boolean)$this->authentication &&
(boolean)$this->realm;
}
-
+
/**
* Accessor for MIME type header information.
* @return string MIME type.
@@ -389,7 +389,7 @@
function getMimeType() {
return $this->mime_type;
}
-
+
/**
* Accessor for authentication type.
* @return string Type.
@@ -398,7 +398,7 @@
function getAuthentication() {
return $this->authentication;
}
-
+
/**
* Accessor for security realm.
* @return string Realm.
@@ -407,7 +407,7 @@
function getRealm() {
return $this->realm;
}
-
+
/**
* Writes new cookies to the cookie jar.
* @param SimpleCookieJar $jar Jar to write to.
@@ -450,7 +450,7 @@
$this->realm = trim($matches[2]);
}
}
-
+
/**
* Parse the Set-cookie content.
* @param string $cookie_line Text after "Set-cookie:"
@@ -485,7 +485,7 @@
private $sent;
private $content;
private $headers;
-
+
/**
* Constructor. Reads and parses the incoming
* content and headers.
@@ -508,7 +508,7 @@
}
$this->parse($raw);
}
-
+
/**
* Splits up the headers and the rest of the content.
* @param string $raw Content to parse.
@@ -529,7 +529,7 @@
$this->headers = new SimpleHttpHeaders($headers);
}
}
-
+
/**
* Original request method.
* @return string GET, POST or HEAD.
@@ -538,7 +538,7 @@
function getMethod() {
return $this->encoding->getMethod();
}
-
+
/**
* Resource name.
* @return SimpleUrl Current url.
@@ -547,7 +547,7 @@
function getUrl() {
return $this->url;
}
-
+
/**
* Original request data.
* @return mixed Sent content.
@@ -556,7 +556,7 @@
function getRequestData() {
return $this->encoding;
}
-
+
/**
* Raw request that was sent down the wire.
* @return string Bytes actually sent.
@@ -565,7 +565,7 @@
function getSent() {
return $this->sent;
}
-
+
/**
* Accessor for the content after the last
* header line.
@@ -575,7 +575,7 @@
function getContent() {
return $this->content;
}
-
+
/**
* Accessor for header block. The response is the
* combination of this and the content.
@@ -585,7 +585,7 @@
function getHeaders() {
return $this->headers;
}
-
+
/**
* Accessor for any new cookies.
* @return array List of new cookies.
@@ -594,7 +594,7 @@
function getNewCookies() {
return $this->headers->getNewCookies();
}
-
+
/**
* Reads the whole of the socket output into a
* single string.
@@ -610,7 +610,7 @@
}
return $all;
}
-
+
/**
* Test to see if the packet from the socket is the
* last one.
@@ -625,4 +625,4 @@
return ! $packet;
}
}
-?>
+?>
\ No newline at end of file
Modified: simpletest/trunk/recorder.php
===================================================================
--- simpletest/trunk/recorder.php 2011-04-28 15:56:11 UTC (rev 2010)
+++ simpletest/trunk/recorder.php 2011-04-29 08:22:48 UTC (rev 2011)
@@ -23,7 +23,7 @@
public $time;
public $breadcrumb;
public $message;
-
+
/**
* Records the test result as public members.
* @param array $breadcrumb Test stack at the time of the event.
@@ -36,20 +36,20 @@
}
/**
- * A single pass captured for later.
+ * A single pass captured for later.
* @package SimpleTest
* @subpackage Extensions
*/
class SimpleResultOfPass extends SimpleResult { }
-/**
+/**
* A single failure captured for later.
* @package SimpleTest
* @subpackage Extensions
*/
class SimpleResultOfFail extends SimpleResult { }
-/**
+/**
* A single exception captured for later.
* @package SimpleTest
* @subpackage Extensions
@@ -64,7 +64,7 @@
*/
class Recorder extends SimpleReporterDecorator {
public $results = array();
-
+
/**
* Stashes the pass as a SimpleResultOfPass
* for later retrieval.
@@ -75,7 +75,7 @@
parent::paintPass($message);
$this->results[] = new SimpleResultOfPass(parent::getTestList(), $message);
}
-
+
/**
* Stashes the fail as a SimpleResultOfFail
* for later retrieval.
@@ -86,7 +86,7 @@
parent::paintFail($message);
$this->results[] = new SimpleResultOfFail(parent::getTestList(), $message);
}
-
+
/**
* Stashes the exception as a SimpleResultOfException
* for later retrieval.
@@ -98,4 +98,4 @@
$this->results[] = new SimpleResultOfException(parent::getTestList(), $message);
}
}
-?>
+?>
\ No newline at end of file
Modified: simpletest/trunk/reflection_php4.php
===================================================================
--- simpletest/trunk/reflection_php4.php 2011-04-28 15:56:11 UTC (rev 2010)
+++ simpletest/trunk/reflection_php4.php 2011-04-29 08:22:48 UTC (rev 2011)
@@ -112,7 +112,7 @@
function isInterface() {
return false;
}
-
+
/**
* Scans for final methods, but as it's PHP 4 there
* aren't any.
Modified: simpletest/trunk/reflection_php5.php
===================================================================
--- simpletest/trunk/reflection_php5.php 2011-04-28 15:56:11 UTC (rev 2010)
+++ simpletest/trunk/reflection_php5.php 2011-04-29 08:22:48 UTC (rev 2011)
@@ -294,7 +294,7 @@
if ($name == '__toString') {
return "function $name()";
}
-
+
// This wonky try-catch is a work around for a faulty method_exists()
// in early versions of PHP 5 which would return false for static
// methods. The Reflection classes work fine, but hasMethod()
Modified: simpletest/trunk/remote.php
===================================================================
--- simpletest/trunk/remote.php 2011-04-28 15:56:11 UTC (rev 2010)
+++ simpletest/trunk/remote.php 2011-04-29 08:22:48 UTC (rev 2011)
@@ -23,7 +23,7 @@
private $url;
private $dry_url;
private $size;
-
+
/**
* Sets the location of the remote test.
* @param string $url Test location.
@@ -35,7 +35,7 @@
$this->dry_url = $dry_url ? $dry_url : $url;
$this->size = false;
}
-
+
/**
* Accessor for the test name for subclasses.
* @return string Name of the test.
@@ -67,7 +67,7 @@
}
return true;
}
-
+
/**
* Creates a new web browser object for fetching
* the XML report.
@@ -77,7 +77,7 @@
protected function createBrowser() {
return new SimpleBrowser();
}
-
+
/**
* Creates the XML parser.
* @param SimpleReporter $reporter Target of test results.
@@ -87,7 +87,7 @@
protected function createParser($reporter) {
return new SimpleTestXmlParser($reporter);
}
-
+
/**
* Accessor for the number of subtests.
* @return integer Number of test cases.
Modified: simpletest/trunk/scorer.php
===================================================================
--- simpletest/trunk/scorer.php 2011-04-28 15:56:11 UTC (rev 2010)
+++ simpletest/trunk/scorer.php 2011-04-29 08:22:48 UTC (rev 2011)
@@ -166,7 +166,7 @@
function paintException($exception) {
$this->exceptions++;
}
-
+
/**
* Prints the message for skipping tests.
* @param string $message Text of skip condition.
@@ -253,7 +253,7 @@
$this->size = null;
$this->progress = 0;
}
-
+
/**
* Gets the formatter for small generic data items.
* @return SimpleDumper Formatter.
@@ -481,7 +481,7 @@
function createInvoker($invoker) {
return $this->reporter->createInvoker($invoker);
}
-
+
/**
* Gets the formatter for privateiables and other small
* generic data items.
@@ -583,7 +583,7 @@
function paintException($exception) {
$this->reporter->paintException($exception);
}
-
+
/**
* Prints the message for skipping tests.
* @param string $message Text of skip condition.
@@ -701,7 +701,7 @@
}
return $invoker;
}
-
+
/**
* Gets the formatter for privateiables and other small
* generic data items.
@@ -812,7 +812,7 @@
$this->reporters[$i]->paintError($message);
}
}
-
+
/**
* Chains to the wrapped reporter.
* @param Exception $exception Exception to display.
Modified: simpletest/trunk/shell_tester.php
===================================================================
--- simpletest/trunk/shell_tester.php 2011-04-28 15:56:11 UTC (rev 2010)
+++ simpletest/trunk/shell_tester.php 2011-04-29 08:22:48 UTC (rev 2011)
@@ -154,7 +154,7 @@
function assertFalse($result, $message = '%s') {
return $this->assert(new FalseExpectation(), $result, $message);
}
-
+
/**
* Will trigger a pass if the two parameters have
* the same value only. Otherwise a fail. This
@@ -171,7 +171,7 @@
$second,
$message);
}
-
+
/**
* Will trigger a pass if the two parameters have
* a different value. Otherwise a fail. This
Modified: simpletest/trunk/simpletest.php
===================================================================
--- simpletest/trunk/simpletest.php 2011-04-28 15:56:11 UTC (rev 2010)
+++ simpletest/trunk/simpletest.php 2011-04-29 08:22:48 UTC (rev 2011)
@@ -219,7 +219,7 @@
'DefaultProxyPassword' => false,
'Preferred' => array(new HtmlReporter(), new TextReporter(), new XmlReporter()));
}
-
+
/**
* @deprecated
*/
Modified: simpletest/trunk/tag.php
===================================================================
--- simpletest/trunk/tag.php 2011-04-28 15:56:11 UTC (rev 2010)
+++ simpletest/trunk/tag.php 2011-04-29 08:22:48 UTC (rev 2011)
@@ -182,7 +182,7 @@
$this->addTag($tag);
}
}
-
+
/**
* Accessor for tag name.
* @return string Name of tag.
Modified: simpletest/trunk/url.php
===================================================================
--- simpletest/trunk/url.php 2011-04-28 15:56:11 UTC (rev 2010)
+++ simpletest/trunk/url.php 2011-04-29 08:22:48 UTC (rev 2011)
@@ -35,7 +35,7 @@
private $y;
private $target;
private $raw = false;
-
+
/**
* Constructor. Parses URL into sections.
* @param string $url Incoming URL.
@@ -71,7 +71,7 @@
$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
@@ -86,7 +86,7 @@
}
return array(false, false);
}
-
+
/**
* Extracts the scheme part of an incoming URL.
* @param string $url URL so far. The scheme will be
@@ -101,7 +101,7 @@
}
return false;
}
-
+
/**
* Extracts the username and password from the
* incoming URL. The // prefix will be reattached
@@ -128,7 +128,7 @@
$url = $prefix . $url;
return array(false, false);
}
-
+
/**
* Extracts the host part of an incoming URL.
* Includes the port number part. Will extract
@@ -157,7 +157,7 @@
}
return false;
}
-
+
/**
* Extracts the path information from the incoming
* URL. Strips this path from the URL.
@@ -173,7 +173,7 @@
}
return '';
}
-
+
/**
* Strips off the request data.
* @param string $url URL so far. The request will be
@@ -188,7 +188,7 @@
}
return '';
}
-
+
/**
* Breaks the request down into an object.
* @param string $raw Raw request.
@@ -207,7 +207,7 @@
}
return $request;
}
-
+
/**
* Accessor for protocol part.
* @param string $default Value to use if not present.
@@ -217,7 +217,7 @@
function getScheme($default = false) {
return $this->scheme ? $this->scheme : $default;
}
-
+
/**
* Accessor for user name.
* @return string Username preceding host.
@@ -226,7 +226,7 @@
function getUsername() {
return $this->username;
}
-
+
/**
* Accessor for password.
* @return string Password preceding host.
@@ -235,7 +235,7 @@
function getPassword() {
return $this->password;
}
-
+
/**
* Accessor for hostname and port.
* @param string $default Value to use if not present.
@@ -245,7 +245,7 @@
function getHost($default = false) {
return $this->host ? $this->host : $default;
}
-
+
/**
* Accessor for top level domain.
* @return string Last part of host.
@@ -255,7 +255,7 @@
$path_parts = pathinfo($this->getHost());
return (isset($path_parts['extension']) ? $path_parts['extension'] : false);
}
-
+
/**
* Accessor for port number.
* @return integer TCP/IP port number.
@@ -263,8 +263,8 @@
*/
function getPort() {
return $this->port;
- }
-
+ }
+
/**
* Accessor for path.
* @return string Full path including leading slash if implied.
@@ -276,7 +276,7 @@
}
return $this->path;
}
-
+
/**
* Accessor for page if any. This may be a
* directory name if ambiguious.
@@ -289,7 +289,7 @@
}
return $matches[1];
}
-
+
/**
* Gets the path to the page.
* @return string Path less the page.
@@ -301,7 +301,7 @@
}
return $matches[1];
}
-
+
/**
* Accessor for fragment at end of URL after the "#".
* @return string Part after "#".
@@ -310,7 +310,7 @@
function getFragment() {
return $this->fragment;
}
-
+
/**
* Sets image coordinates. Set to false to clear
* them.
@@ -326,7 +326,7 @@
$this->x = (integer)$x;
$this->y = (integer)$y;
}
-
+
/**
* Accessor for horizontal image coordinate.
* @return integer X value.
@@ -335,7 +335,7 @@
function getX() {
return $this->x;
}
-
+
/**
* Accessor for vertical image coordinate.
* @return integer Y value.
@@ -344,7 +344,7 @@
function getY() {
return $this->y;
}
-
+
/**
* Accessor for current request parameters
* in URL string form. Will return teh original request
@@ -364,7 +364,7 @@
}
return '';
}
-
+
/**
* Adds an additional parameter to the request.
* @param string $key Name of parameter.
@@ -375,7 +375,7 @@
$this->raw = false;
$this->request->add($key, $value);
}
-
+
/**
* Adds additional parameters to the request.
* @param hash/SimpleFormEncoding $parameters Additional
@@ -386,7 +386,7 @@
$this->raw = false;
$this->request->merge($parameters);
}
-
+
/**
* Clears down all parameters.
* @access public
@@ -395,7 +395,7 @@
$this->raw = false;
$this->request = new SimpleGetEncoding();
}
-
+
/**
* Gets the frame target if present. Although
* not strictly part of the URL specification it
@@ -406,7 +406,7 @@
function getTarget() {
return $this->target;
}
-
+
/**
* Attaches a frame target.
* @param string $frame Name of frame.
@@ -416,7 +416,7 @@
$this->raw = false;
$this->target = $frame;
}
-
+
/**
* Renders the URL back into a string.
* @return string URL in canonical form.
@@ -450,7 +450,7 @@
$coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
return "$scheme$identity$host$port$path$encoded$fragment$coords";
}
-
+
/**
* Replaces unknown sections to turn a relative
* URL into an absolute one. The base URL can
@@ -482,7 +482,7 @@
$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.
@@ -502,7 +502,7 @@
}
return $base->getPath();
}
-
+
/**
* Simple test to see if a path part is relative.
* @param string $path Path to test.
@@ -512,7 +512,7 @@
protected function isRelativePath($path) {
return (substr($path, 0, 1) != '/');
}
-
+
/**
* Extracts the username and password for use in rendering
* a URL.
@@ -525,7 +525,7 @@
}
return false;
}
-
+
/**
* Replaces . and .. sections of the path.
* @param string $path Unoptimised path.
@@ -536,7 +536,7 @@
$path = preg_replace('|/\./|', '/', $path);
return preg_replace('|/[^/]+/\.\./|', '/', $path);
}
-
+
/**
* A pipe seperated list of all TLDs that result in two part
* domain names.
@@ -547,4 +547,4 @@
return 'com|edu|net|org|gov|mil|int|biz|info|name|pro|aero|coop|museum';
}
}
-?>
+?>
\ No newline at end of file
Modified: simpletest/trunk/user_agent.php
===================================================================
--- simpletest/trunk/user_agent.php 2011-04-28 15:56:11 UTC (rev 2010)
+++ simpletest/trunk/user_agent.php 2011-04-29 08:22:48 UTC (rev 2011)
@@ -38,7 +38,7 @@
private $proxy_password = false;
private $connection_timeout = DEFAULT_CONNECTION_TIMEOUT;
private $additional_headers = array();
-
+
/**
* Starts with no cookies, realms or proxies.
* @access public
@@ -47,7 +47,7 @@
$this->cookie_jar = new SimpleCookieJar();
$this->authenticator = new SimpleAuthenticator();
}
-
+
/**
* Removes expired and temporary cookies as if
* the browser was closed and re-opened. Authorisation
@@ -61,7 +61,7 @@
$this->cookie_jar->restartSession($date);
$this->authenticator->restartSession();
}
-
+
/**
* Adds a header to every fetch.
* @param string $header Header line to add to every
@@ -71,7 +71,7 @@
function addHeader($header) {
$this->additional_headers[] = $header;
}
-
+
/**
* Ages the cookies by the specified time.
* @param integer $interval Amount in seconds.
@@ -80,7 +80,7 @@
function ageCookies($interval) {
$this->cookie_jar->agePrematurely($interval);
}
-
+
/**
* Sets an additional cookie. If a cookie has
* the same name and path it is replaced.
@@ -94,7 +94,7 @@
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.
@@ -108,7 +108,7 @@
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.
@@ -123,7 +123,7 @@
}
return $this->getCookieValue($base->getHost(), $base->getPath(), $name);
}
-
+
/**
* Switches off cookie sending and recieving.
* @access public
@@ -131,7 +131,7 @@
function ignoreCookies() {
$this->cookies_enabled = false;
}
-
+
/**
* Switches back on the cookie sending and recieving.
* @access public
@@ -139,7 +139,7 @@
function useCookies() {
$this->cookies_enabled = true;
}
-
+
/**
* Sets the socket timeout for opening a connection.
* @param integer $timeout Maximum time in seconds.
@@ -148,7 +148,7 @@
function setConnectionTimeout($timeout) {
$this->connection_timeout = $timeout;
}
-
+
/**
* Sets the maximum number of redirects before
* a page will be loaded anyway.
@@ -158,7 +158,7 @@
function setMaximumRedirects($max) {
$this->max_redirects = $max;
}
-
+
/**
* Sets proxy to use on all requests for when
* testing from behind a firewall. Set URL
@@ -180,7 +180,7 @@
$this->proxy_username = $username;
$this->proxy_password = $password;
}
-
+
/**
* Test to see if the redirect limit is passed.
* @param integer $redirects Count so far.
@@ -190,7 +190,7 @@
protected function isTooManyRedirects($redirects) {
return ($redirects > $this->max_redirects);
}
-
+
/**
* Sets the identity for the current realm.
* @param string $host Host to which realm applies.
@@ -202,7 +202,7 @@
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.
@@ -227,7 +227,7 @@
}
return $response;
}
-
+
/**
* Fetches the page until no longer redirected or
* until the redirect limit runs out.
@@ -256,7 +256,7 @@
} while (! $this->isTooManyRedirects(++$redirects));
return $response;
}
-
+
/**
* Actually make the web request.
* @param SimpleUrl $url Target to fetch.
@@ -268,7 +268,7 @@
$request = $this->createRequest($url, $encoding);
return $request->fetch($this->connection_timeout);
}
-
+
/**
* Creates a full page request.
* @param SimpleUrl $url Target to fetch as url object.
@@ -285,7 +285,7 @@
$this->authenticator->addHeaders($request, $url);
return $request;
}
-
+
/**
* Builds the appropriate HTTP request object.
* @param SimpleUrl $url Target to fetch as url object.
@@ -296,7 +296,7 @@
protected function createHttpRequest($url, $encoding) {
return new SimpleHttpRequest($this->createRoute($url), $encoding);
}
-
+
...
[truncated message content] |