YetiForceCompany / YetiForceCRM

libraries/SabreDAV/HTTP/Request.php

Indentation +295 added lines, -295 removed lines

@@ -17,300 +17,300 @@
  */
 class Request extends Message implements RequestInterface {
 
-    /**
-     * HTTP Method
-     *
-     * @var string
-     */
-    protected $method;
-
-    /**
-     * Request Url
-     *
-     * @var string
-     */
-    protected $url;
-
-    /**
-     * Creates the request object
-     *
-     * @param string $method
-     * @param string $url
-     * @param array $headers
-     * @param resource $body
-     */
-    public function __construct($method = null, $url = null, array $headers = null, $body = null) {
-
-        if (is_array($method)) {
-            throw new InvalidArgumentException('The first argument for this constructor should be a string or null, not an array. Did you upgrade from sabre/http 1.0 to 2.0?');
-        }
-        if (!is_null($method))      $this->setMethod($method);
-        if (!is_null($url))         $this->setUrl($url);
-        if (!is_null($headers))     $this->setHeaders($headers);
-        if (!is_null($body))        $this->setBody($body);
-
-    }
-
-    /**
-     * Returns the current HTTP method
-     *
-     * @return string
-     */
-    public function getMethod() {
-
-        return $this->method;
-
-    }
-
-    /**
-     * Sets the HTTP method
-     *
-     * @param string $method
-     * @return void
-     */
-    public function setMethod($method) {
-
-        $this->method = $method;
-
-    }
-
-    /**
-     * Returns the request url.
-     *
-     * @return string
-     */
-    public function getUrl() {
-
-        return $this->url;
-
-    }
-
-    /**
-     * Sets the request url.
-     *
-     * @param string $url
-     * @return void
-     */
-    public function setUrl($url) {
-
-        $this->url = $url;
-
-    }
-
-    /**
-     * Returns the list of query parameters.
-     *
-     * This is equivalent to PHP's $_GET superglobal.
-     *
-     * @return array
-     */
-    public function getQueryParameters() {
-
-        $url = $this->getUrl();
-        if (($index = strpos($url, '?')) === false) {
-            return [];
-        } else {
-            parse_str(substr($url, $index + 1), $queryParams);
-            return $queryParams;
-        }
-
-    }
-
-    /**
-     * Sets the absolute url.
-     *
-     * @param string $url
-     * @return void
-     */
-    public function setAbsoluteUrl($url) {
-
-        $this->absoluteUrl = $url;
-
-    }
-
-    /**
-     * Returns the absolute url.
-     *
-     * @return string
-     */
-    public function getAbsoluteUrl() {
-
-        return $this->absoluteUrl;
-
-    }
-
-    /**
-     * Base url
-     *
-     * @var string
-     */
-    protected $baseUrl = '/';
-
-    /**
-     * Sets a base url.
-     *
-     * This url is used for relative path calculations.
-     *
-     * @param string $url
-     * @return void
-     */
-    public function setBaseUrl($url) {
-
-        $this->baseUrl = $url;
-
-    }
-
-    /**
-     * Returns the current base url.
-     *
-     * @return string
-     */
-    public function getBaseUrl() {
-
-        return $this->baseUrl;
-
-    }
-
-    /**
-     * Returns the relative path.
-     *
-     * This is being calculated using the base url. This path will not start
-     * with a slash, so it will always return something like
-     * 'example/path.html'.
-     *
-     * If the full path is equal to the base url, this method will return an
-     * empty string.
-     *
-     * This method will also urldecode the path, and if the url was incoded as
-     * ISO-8859-1, it will convert it to UTF-8.
-     *
-     * If the path is outside of the base url, a LogicException will be thrown.
-     *
-     * @return string
-     */
-    public function getPath() {
-
-        // Removing duplicated slashes.
-        $uri = str_replace('//', '/', $this->getUrl());
-
-        $uri = Uri\normalize($uri);
-        $baseUri = Uri\normalize($this->getBaseUrl());
-
-        if (strpos($uri, $baseUri) === 0) {
-
-            // We're not interested in the query part (everything after the ?).
-            list($uri) = explode('?', $uri);
-            return trim(URLUtil::decodePath(substr($uri, strlen($baseUri))), '/');
-
-        }
-        // A special case, if the baseUri was accessed without a trailing
-        // slash, we'll accept it as well.
-        elseif ($uri . '/' === $baseUri) {
-
-            return '';
-
-        }
-
-        throw new \LogicException('Requested uri (' . $this->getUrl() . ') is out of base uri (' . $this->getBaseUrl() . ')');
-    }
-
-    /**
-     * Equivalent of PHP's $_POST.
-     *
-     * @var array
-     */
-    protected $postData = [];
-
-    /**
-     * Sets the post data.
-     *
-     * This is equivalent to PHP's $_POST superglobal.
-     *
-     * This would not have been needed, if POST data was accessible as
-     * php://input, but unfortunately we need to special case it.
-     *
-     * @param array $postData
-     * @return void
-     */
-    public function setPostData(array $postData) {
-
-        $this->postData = $postData;
-
-    }
-
-    /**
-     * Returns the POST data.
-     *
-     * This is equivalent to PHP's $_POST superglobal.
-     *
-     * @return array
-     */
-    public function getPostData() {
-
-        return $this->postData;
-
-    }
-
-    /**
-     * An array containing the raw _SERVER array.
-     *
-     * @var array
-     */
-    protected $rawServerData;
-
-    /**
-     * Returns an item from the _SERVER array.
-     *
-     * If the value does not exist in the array, null is returned.
-     *
-     * @param string $valueName
-     * @return string|null
-     */
-    public function getRawServerValue($valueName) {
-
-        if (isset($this->rawServerData[$valueName])) {
-            return $this->rawServerData[$valueName];
-        }
-
-    }
-
-    /**
-     * Sets the _SERVER array.
-     *
-     * @param array $data
-     * @return void
-     */
-    public function setRawServerData(array $data) {
-
-        $this->rawServerData = $data;
-
-    }
-
-    /**
-     * Serializes the request object as a string.
-     *
-     * This is useful for debugging purposes.
-     *
-     * @return string
-     */
-    public function __toString() {
-
-        $out = $this->getMethod() . ' ' . $this->getUrl() . ' HTTP/' . $this->getHTTPVersion() . "\r\n";
-
-        foreach ($this->getHeaders() as $key => $value) {
-            foreach ($value as $v) {
-                if ($key === 'Authorization') {
-                    list($v) = explode(' ', $v, 2);
-                    $v  .= ' REDACTED';
-                }
-                $out .= $key . ": " . $v . "\r\n";
-            }
-        }
-        $out .= "\r\n";
-        $out .= $this->getBodyAsString();
-
-        return $out;
-
-    }
+	/**
+	 * HTTP Method
+	 *
+	 * @var string
+	 */
+	protected $method;
+
+	/**
+	 * Request Url
+	 *
+	 * @var string
+	 */
+	protected $url;
+
+	/**
+	 * Creates the request object
+	 *
+	 * @param string $method
+	 * @param string $url
+	 * @param array $headers
+	 * @param resource $body
+	 */
+	public function __construct($method = null, $url = null, array $headers = null, $body = null) {
+
+		if (is_array($method)) {
+			throw new InvalidArgumentException('The first argument for this constructor should be a string or null, not an array. Did you upgrade from sabre/http 1.0 to 2.0?');
+		}
+		if (!is_null($method))      $this->setMethod($method);
+		if (!is_null($url))         $this->setUrl($url);
+		if (!is_null($headers))     $this->setHeaders($headers);
+		if (!is_null($body))        $this->setBody($body);
+
+	}
+
+	/**
+	 * Returns the current HTTP method
+	 *
+	 * @return string
+	 */
+	public function getMethod() {
+
+		return $this->method;
+
+	}
+
+	/**
+	 * Sets the HTTP method
+	 *
+	 * @param string $method
+	 * @return void
+	 */
+	public function setMethod($method) {
+
+		$this->method = $method;
+
+	}
+
+	/**
+	 * Returns the request url.
+	 *
+	 * @return string
+	 */
+	public function getUrl() {
+
+		return $this->url;
+
+	}
+
+	/**
+	 * Sets the request url.
+	 *
+	 * @param string $url
+	 * @return void
+	 */
+	public function setUrl($url) {
+
+		$this->url = $url;
+
+	}
+
+	/**
+	 * Returns the list of query parameters.
+	 *
+	 * This is equivalent to PHP's $_GET superglobal.
+	 *
+	 * @return array
+	 */
+	public function getQueryParameters() {
+
+		$url = $this->getUrl();
+		if (($index = strpos($url, '?')) === false) {
+			return [];
+		} else {
+			parse_str(substr($url, $index + 1), $queryParams);
+			return $queryParams;
+		}
+
+	}
+
+	/**
+	 * Sets the absolute url.
+	 *
+	 * @param string $url
+	 * @return void
+	 */
+	public function setAbsoluteUrl($url) {
+
+		$this->absoluteUrl = $url;
+
+	}
+
+	/**
+	 * Returns the absolute url.
+	 *
+	 * @return string
+	 */
+	public function getAbsoluteUrl() {
+
+		return $this->absoluteUrl;
+
+	}
+
+	/**
+	 * Base url
+	 *
+	 * @var string
+	 */
+	protected $baseUrl = '/';
+
+	/**
+	 * Sets a base url.
+	 *
+	 * This url is used for relative path calculations.
+	 *
+	 * @param string $url
+	 * @return void
+	 */
+	public function setBaseUrl($url) {
+
+		$this->baseUrl = $url;
+
+	}
+
+	/**
+	 * Returns the current base url.
+	 *
+	 * @return string
+	 */
+	public function getBaseUrl() {
+
+		return $this->baseUrl;
+
+	}
+
+	/**
+	 * Returns the relative path.
+	 *
+	 * This is being calculated using the base url. This path will not start
+	 * with a slash, so it will always return something like
+	 * 'example/path.html'.
+	 *
+	 * If the full path is equal to the base url, this method will return an
+	 * empty string.
+	 *
+	 * This method will also urldecode the path, and if the url was incoded as
+	 * ISO-8859-1, it will convert it to UTF-8.
+	 *
+	 * If the path is outside of the base url, a LogicException will be thrown.
+	 *
+	 * @return string
+	 */
+	public function getPath() {
+
+		// Removing duplicated slashes.
+		$uri = str_replace('//', '/', $this->getUrl());
+
+		$uri = Uri\normalize($uri);
+		$baseUri = Uri\normalize($this->getBaseUrl());
+
+		if (strpos($uri, $baseUri) === 0) {
+
+			// We're not interested in the query part (everything after the ?).
+			list($uri) = explode('?', $uri);
+			return trim(URLUtil::decodePath(substr($uri, strlen($baseUri))), '/');
+
+		}
+		// A special case, if the baseUri was accessed without a trailing
+		// slash, we'll accept it as well.
+		elseif ($uri . '/' === $baseUri) {
+
+			return '';
+
+		}
+
+		throw new \LogicException('Requested uri (' . $this->getUrl() . ') is out of base uri (' . $this->getBaseUrl() . ')');
+	}
+
+	/**
+	 * Equivalent of PHP's $_POST.
+	 *
+	 * @var array
+	 */
+	protected $postData = [];
+
+	/**
+	 * Sets the post data.
+	 *
+	 * This is equivalent to PHP's $_POST superglobal.
+	 *
+	 * This would not have been needed, if POST data was accessible as
+	 * php://input, but unfortunately we need to special case it.
+	 *
+	 * @param array $postData
+	 * @return void
+	 */
+	public function setPostData(array $postData) {
+
+		$this->postData = $postData;
+
+	}
+
+	/**
+	 * Returns the POST data.
+	 *
+	 * This is equivalent to PHP's $_POST superglobal.
+	 *
+	 * @return array
+	 */
+	public function getPostData() {
+
+		return $this->postData;
+
+	}
+
+	/**
+	 * An array containing the raw _SERVER array.
+	 *
+	 * @var array
+	 */
+	protected $rawServerData;
+
+	/**
+	 * Returns an item from the _SERVER array.
+	 *
+	 * If the value does not exist in the array, null is returned.
+	 *
+	 * @param string $valueName
+	 * @return string|null
+	 */
+	public function getRawServerValue($valueName) {
+
+		if (isset($this->rawServerData[$valueName])) {
+			return $this->rawServerData[$valueName];
+		}
+
+	}
+
+	/**
+	 * Sets the _SERVER array.
+	 *
+	 * @param array $data
+	 * @return void
+	 */
+	public function setRawServerData(array $data) {
+
+		$this->rawServerData = $data;
+
+	}
+
+	/**
+	 * Serializes the request object as a string.
+	 *
+	 * This is useful for debugging purposes.
+	 *
+	 * @return string
+	 */
+	public function __toString() {
+
+		$out = $this->getMethod() . ' ' . $this->getUrl() . ' HTTP/' . $this->getHTTPVersion() . "\r\n";
+
+		foreach ($this->getHeaders() as $key => $value) {
+			foreach ($value as $v) {
+				if ($key === 'Authorization') {
+					list($v) = explode(' ', $v, 2);
+					$v  .= ' REDACTED';
+				}
+				$out .= $key . ": " . $v . "\r\n";
+			}
+		}
+		$out .= "\r\n";
+		$out .= $this->getBodyAsString();
+
+		return $out;
+
+	}
 
 }

libraries/SabreDAV/HTTP/ResponseInterface.php

Indentation +28 added lines, -28 removed lines

@@ -11,35 +11,35 @@
  */
 interface ResponseInterface extends MessageInterface {
 
-    /**
-     * Returns the current HTTP status code.
-     *
-     * @return int
-     */
-    public function getStatus();
+	/**
+	 * Returns the current HTTP status code.
+	 *
+	 * @return int
+	 */
+	public function getStatus();
 
-    /**
-     * Returns the human-readable status string.
-     *
-     * In the case of a 200, this may for example be 'OK'.
-     *
-     * @return string
-     */
-    public function getStatusText();
+	/**
+	 * Returns the human-readable status string.
+	 *
+	 * In the case of a 200, this may for example be 'OK'.
+	 *
+	 * @return string
+	 */
+	public function getStatusText();
 
-    /**
-     * Sets the HTTP status code.
-     *
-     * This can be either the full HTTP status code with human readable string,
-     * for example: "403 I can't let you do that, Dave".
-     *
-     * Or just the code, in which case the appropriate default message will be
-     * added.
-     *
-     * @param string|int $status
-     * @throws \InvalidArgumentExeption
-     * @return void
-     */
-    public function setStatus($status);
+	/**
+	 * Sets the HTTP status code.
+	 *
+	 * This can be either the full HTTP status code with human readable string,
+	 * for example: "403 I can't let you do that, Dave".
+	 *
+	 * Or just the code, in which case the appropriate default message will be
+	 * added.
+	 *
+	 * @param string|int $status
+	 * @throws \InvalidArgumentExeption
+	 * @return void
+	 */
+	public function setStatus($status);
 
 }

libraries/SabreDAV/HTTP/RequestInterface.php

Indentation +131 added lines, -131 removed lines

@@ -11,137 +11,137 @@
  */
 interface RequestInterface extends MessageInterface {
 
-    /**
-     * Returns the current HTTP method
-     *
-     * @return string
-     */
-    public function getMethod();
-
-    /**
-     * Sets the HTTP method
-     *
-     * @param string $method
-     * @return void
-     */
-    public function setMethod($method);
-
-    /**
-     * Returns the request url.
-     *
-     * @return string
-     */
-    public function getUrl();
-
-    /**
-     * Sets the request url.
-     *
-     * @param string $url
-     * @return void
-     */
-    public function setUrl($url);
-
-    /**
-     * Returns the absolute url.
-     *
-     * @return string
-     */
-    public function getAbsoluteUrl();
-
-    /**
-     * Sets the absolute url.
-     *
-     * @param string $url
-     * @return void
-     */
-    public function setAbsoluteUrl($url);
-
-    /**
-     * Returns the current base url.
-     *
-     * @return string
-     */
-    public function getBaseUrl();
-
-    /**
-     * Sets a base url.
-     *
-     * This url is used for relative path calculations.
-     *
-     * The base url should default to /
-     *
-     * @param string $url
-     * @return void
-     */
-    public function setBaseUrl($url);
-
-    /**
-     * Returns the relative path.
-     *
-     * This is being calculated using the base url. This path will not start
-     * with a slash, so it will always return something like
-     * 'example/path.html'.
-     *
-     * If the full path is equal to the base url, this method will return an
-     * empty string.
-     *
-     * This method will also urldecode the path, and if the url was incoded as
-     * ISO-8859-1, it will convert it to UTF-8.
-     *
-     * If the path is outside of the base url, a LogicException will be thrown.
-     *
-     * @return string
-     */
-    public function getPath();
-
-    /**
-     * Returns the list of query parameters.
-     *
-     * This is equivalent to PHP's $_GET superglobal.
-     *
-     * @return array
-     */
-    public function getQueryParameters();
-
-    /**
-     * Returns the POST data.
-     *
-     * This is equivalent to PHP's $_POST superglobal.
-     *
-     * @return array
-     */
-    public function getPostData();
-
-    /**
-     * Sets the post data.
-     *
-     * This is equivalent to PHP's $_POST superglobal.
-     *
-     * This would not have been needed, if POST data was accessible as
-     * php://input, but unfortunately we need to special case it.
-     *
-     * @param array $postData
-     * @return void
-     */
-    public function setPostData(array $postData);
-
-    /**
-     * Returns an item from the _SERVER array.
-     *
-     * If the value does not exist in the array, null is returned.
-     *
-     * @param string $valueName
-     * @return string|null
-     */
-    public function getRawServerValue($valueName);
-
-    /**
-     * Sets the _SERVER array.
-     *
-     * @param array $data
-     * @return void
-     */
-    public function setRawServerData(array $data);
+	/**
+	 * Returns the current HTTP method
+	 *
+	 * @return string
+	 */
+	public function getMethod();
+
+	/**
+	 * Sets the HTTP method
+	 *
+	 * @param string $method
+	 * @return void
+	 */
+	public function setMethod($method);
+
+	/**
+	 * Returns the request url.
+	 *
+	 * @return string
+	 */
+	public function getUrl();
+
+	/**
+	 * Sets the request url.
+	 *
+	 * @param string $url
+	 * @return void
+	 */
+	public function setUrl($url);
+
+	/**
+	 * Returns the absolute url.
+	 *
+	 * @return string
+	 */
+	public function getAbsoluteUrl();
+
+	/**
+	 * Sets the absolute url.
+	 *
+	 * @param string $url
+	 * @return void
+	 */
+	public function setAbsoluteUrl($url);
+
+	/**
+	 * Returns the current base url.
+	 *
+	 * @return string
+	 */
+	public function getBaseUrl();
+
+	/**
+	 * Sets a base url.
+	 *
+	 * This url is used for relative path calculations.
+	 *
+	 * The base url should default to /
+	 *
+	 * @param string $url
+	 * @return void
+	 */
+	public function setBaseUrl($url);
+
+	/**
+	 * Returns the relative path.
+	 *
+	 * This is being calculated using the base url. This path will not start
+	 * with a slash, so it will always return something like
+	 * 'example/path.html'.
+	 *
+	 * If the full path is equal to the base url, this method will return an
+	 * empty string.
+	 *
+	 * This method will also urldecode the path, and if the url was incoded as
+	 * ISO-8859-1, it will convert it to UTF-8.
+	 *
+	 * If the path is outside of the base url, a LogicException will be thrown.
+	 *
+	 * @return string
+	 */
+	public function getPath();
+
+	/**
+	 * Returns the list of query parameters.
+	 *
+	 * This is equivalent to PHP's $_GET superglobal.
+	 *
+	 * @return array
+	 */
+	public function getQueryParameters();
+
+	/**
+	 * Returns the POST data.
+	 *
+	 * This is equivalent to PHP's $_POST superglobal.
+	 *
+	 * @return array
+	 */
+	public function getPostData();
+
+	/**
+	 * Sets the post data.
+	 *
+	 * This is equivalent to PHP's $_POST superglobal.
+	 *
+	 * This would not have been needed, if POST data was accessible as
+	 * php://input, but unfortunately we need to special case it.
+	 *
+	 * @param array $postData
+	 * @return void
+	 */
+	public function setPostData(array $postData);
+
+	/**
+	 * Returns an item from the _SERVER array.
+	 *
+	 * If the value does not exist in the array, null is returned.
+	 *
+	 * @param string $valueName
+	 * @return string|null
+	 */
+	public function getRawServerValue($valueName);
+
+	/**
+	 * Sets the _SERVER array.
+	 *
+	 * @param array $data
+	 * @return void
+	 */
+	public function setRawServerData(array $data);
 
 
 }

libraries/SabreDAV/HTTP/MessageInterface.php

Indentation +161 added lines, -161 removed lines

@@ -12,166 +12,166 @@
  */
 interface MessageInterface {
 
-    /**
-     * Returns the body as a readable stream resource.
-     *
-     * Note that the stream may not be rewindable, and therefore may only be
-     * read once.
-     *
-     * @return resource
-     */
-    public function getBodyAsStream();
-
-    /**
-     * Returns the body as a string.
-     *
-     * Note that because the underlying data may be based on a stream, this
-     * method could only work correctly the first time.
-     *
-     * @return string
-     */
-    public function getBodyAsString();
-
-    /**
-     * Returns the message body, as it's internal representation.
-     *
-     * This could be either a string or a stream.
-     *
-     * @return resource|string
-     */
-    public function getBody();
-
-    /**
-     * Updates the body resource with a new stream.
-     *
-     * @param resource $body
-     * @return void
-     */
-    public function setBody($body);
-
-    /**
-     * Returns all the HTTP headers as an array.
-     *
-     * Every header is returned as an array, with one or more values.
-     *
-     * @return array
-     */
-    public function getHeaders();
-
-    /**
-     * Will return true or false, depending on if a HTTP header exists.
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function hasHeader($name);
-
-    /**
-     * Returns a specific HTTP header, based on it's name.
-     *
-     * The name must be treated as case-insensitive.
-     * If the header does not exist, this method must return null.
-     *
-     * If a header appeared more than once in a HTTP request, this method will
-     * concatenate all the values with a comma.
-     *
-     * Note that this not make sense for all headers. Some, such as
-     * `Set-Cookie` cannot be logically combined with a comma. In those cases
-     * you *should* use getHeaderAsArray().
-     *
-     * @param string $name
-     * @return string|null
-     */
-    public function getHeader($name);
-
-    /**
-     * Returns a HTTP header as an array.
-     *
-     * For every time the HTTP header appeared in the request or response, an
-     * item will appear in the array.
-     *
-     * If the header did not exists, this method will return an empty array.
-     *
-     * @param string $name
-     * @return string[]
-     */
-    public function getHeaderAsArray($name);
-
-    /**
-     * Updates a HTTP header.
-     *
-     * The case-sensitity of the name value must be retained as-is.
-     *
-     * If the header already existed, it will be overwritten.
-     *
-     * @param string $name
-     * @param string|string[] $value
-     * @return void
-     */
-    public function setHeader($name, $value);
-
-    /**
-     * Sets a new set of HTTP headers.
-     *
-     * The headers array should contain headernames for keys, and their value
-     * should be specified as either a string or an array.
-     *
-     * Any header that already existed will be overwritten.
-     *
-     * @param array $headers
-     * @return void
-     */
-    public function setHeaders(array $headers);
-
-    /**
-     * Adds a HTTP header.
-     *
-     * This method will not overwrite any existing HTTP header, but instead add
-     * another value. Individual values can be retrieved with
-     * getHeadersAsArray.
-     *
-     * @param string $name
-     * @param string $value
-     * @return void
-     */
-    public function addHeader($name, $value);
-
-    /**
-     * Adds a new set of HTTP headers.
-     *
-     * Any existing headers will not be overwritten.
-     *
-     * @param array $headers
-     * @return void
-     */
-    public function addHeaders(array $headers);
-
-    /**
-     * Removes a HTTP header.
-     *
-     * The specified header name must be treated as case-insenstive.
-     * This method should return true if the header was successfully deleted,
-     * and false if the header did not exist.
-     *
-     * @return bool
-     */
-    public function removeHeader($name);
-
-    /**
-     * Sets the HTTP version.
-     *
-     * Should be 1.0 or 1.1.
-     *
-     * @param string $version
-     * @return void
-     */
-    public function setHttpVersion($version);
-
-    /**
-     * Returns the HTTP version.
-     *
-     * @return string
-     */
-    public function getHttpVersion();
+	/**
+	 * Returns the body as a readable stream resource.
+	 *
+	 * Note that the stream may not be rewindable, and therefore may only be
+	 * read once.
+	 *
+	 * @return resource
+	 */
+	public function getBodyAsStream();
+
+	/**
+	 * Returns the body as a string.
+	 *
+	 * Note that because the underlying data may be based on a stream, this
+	 * method could only work correctly the first time.
+	 *
+	 * @return string
+	 */
+	public function getBodyAsString();
+
+	/**
+	 * Returns the message body, as it's internal representation.
+	 *
+	 * This could be either a string or a stream.
+	 *
+	 * @return resource|string
+	 */
+	public function getBody();
+
+	/**
+	 * Updates the body resource with a new stream.
+	 *
+	 * @param resource $body
+	 * @return void
+	 */
+	public function setBody($body);
+
+	/**
+	 * Returns all the HTTP headers as an array.
+	 *
+	 * Every header is returned as an array, with one or more values.
+	 *
+	 * @return array
+	 */
+	public function getHeaders();
+
+	/**
+	 * Will return true or false, depending on if a HTTP header exists.
+	 *
+	 * @param string $name
+	 * @return bool
+	 */
+	public function hasHeader($name);
+
+	/**
+	 * Returns a specific HTTP header, based on it's name.
+	 *
+	 * The name must be treated as case-insensitive.
+	 * If the header does not exist, this method must return null.
+	 *
+	 * If a header appeared more than once in a HTTP request, this method will
+	 * concatenate all the values with a comma.
+	 *
+	 * Note that this not make sense for all headers. Some, such as
+	 * `Set-Cookie` cannot be logically combined with a comma. In those cases
+	 * you *should* use getHeaderAsArray().
+	 *
+	 * @param string $name
+	 * @return string|null
+	 */
+	public function getHeader($name);
+
+	/**
+	 * Returns a HTTP header as an array.
+	 *
+	 * For every time the HTTP header appeared in the request or response, an
+	 * item will appear in the array.
+	 *
+	 * If the header did not exists, this method will return an empty array.
+	 *
+	 * @param string $name
+	 * @return string[]
+	 */
+	public function getHeaderAsArray($name);
+
+	/**
+	 * Updates a HTTP header.
+	 *
+	 * The case-sensitity of the name value must be retained as-is.
+	 *
+	 * If the header already existed, it will be overwritten.
+	 *
+	 * @param string $name
+	 * @param string|string[] $value
+	 * @return void
+	 */
+	public function setHeader($name, $value);
+
+	/**
+	 * Sets a new set of HTTP headers.
+	 *
+	 * The headers array should contain headernames for keys, and their value
+	 * should be specified as either a string or an array.
+	 *
+	 * Any header that already existed will be overwritten.
+	 *
+	 * @param array $headers
+	 * @return void
+	 */
+	public function setHeaders(array $headers);
+
+	/**
+	 * Adds a HTTP header.
+	 *
+	 * This method will not overwrite any existing HTTP header, but instead add
+	 * another value. Individual values can be retrieved with
+	 * getHeadersAsArray.
+	 *
+	 * @param string $name
+	 * @param string $value
+	 * @return void
+	 */
+	public function addHeader($name, $value);
+
+	/**
+	 * Adds a new set of HTTP headers.
+	 *
+	 * Any existing headers will not be overwritten.
+	 *
+	 * @param array $headers
+	 * @return void
+	 */
+	public function addHeaders(array $headers);
+
+	/**
+	 * Removes a HTTP header.
+	 *
+	 * The specified header name must be treated as case-insenstive.
+	 * This method should return true if the header was successfully deleted,
+	 * and false if the header did not exist.
+	 *
+	 * @return bool
+	 */
+	public function removeHeader($name);
+
+	/**
+	 * Sets the HTTP version.
+	 *
+	 * Should be 1.0 or 1.1.
+	 *
+	 * @param string $version
+	 * @return void
+	 */
+	public function setHttpVersion($version);
+
+	/**
+	 * Returns the HTTP version.
+	 *
+	 * @return string
+	 */
+	public function getHttpVersion();
 
 }

libraries/SabreDAV/HTTP/Message.php

Indentation +298 added lines, -298 removed lines

@@ -13,302 +13,302 @@
  */
 abstract class Message implements MessageInterface {
 
-    /**
-     * Request body
-     *
-     * This should be a stream resource
-     *
-     * @var resource
-     */
-    protected $body;
-
-    /**
-     * Contains the list of HTTP headers
-     *
-     * @var array
-     */
-    protected $headers = [];
-
-    /**
-     * HTTP message version (1.0 or 1.1)
-     *
-     * @var string
-     */
-    protected $httpVersion = '1.1';
-
-    /**
-     * Returns the body as a readable stream resource.
-     *
-     * Note that the stream may not be rewindable, and therefore may only be
-     * read once.
-     *
-     * @return resource
-     */
-    public function getBodyAsStream() {
-
-        $body = $this->getBody();
-        if (is_string($body) || is_null($body)) {
-            $stream = fopen('php://temp', 'r+');
-            fwrite($stream, $body);
-            rewind($stream);
-            return $stream;
-        }
-        return $body;
-
-    }
-
-    /**
-     * Returns the body as a string.
-     *
-     * Note that because the underlying data may be based on a stream, this
-     * method could only work correctly the first time.
-     *
-     * @return string
-     */
-    public function getBodyAsString() {
-
-        $body = $this->getBody();
-        if (is_string($body)) {
-            return $body;
-        }
-        if (is_null($body)) {
-            return '';
-        }
-        $contentLength = $this->getHeader('Content-Length');
-        if (null === $contentLength) {
-            return stream_get_contents($body);
-        } else {
-            return stream_get_contents($body, $contentLength);
-        }
-
-    }
-
-    /**
-     * Returns the message body, as it's internal representation.
-     *
-     * This could be either a string or a stream.
-     *
-     * @return resource|string
-     */
-    public function getBody() {
-
-        return $this->body;
-
-    }
-
-    /**
-     * Replaces the body resource with a new stream or string.
-     *
-     * @param resource|string $body
-     */
-    public function setBody($body) {
-
-        $this->body = $body;
-
-    }
-
-    /**
-     * Returns all the HTTP headers as an array.
-     *
-     * Every header is returned as an array, with one or more values.
-     *
-     * @return array
-     */
-    public function getHeaders() {
-
-        $result = [];
-        foreach ($this->headers as $headerInfo) {
-            $result[$headerInfo[0]] = $headerInfo[1];
-        }
-        return $result;
-
-    }
-
-    /**
-     * Will return true or false, depending on if a HTTP header exists.
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function hasHeader($name) {
-
-        return isset($this->headers[strtolower($name)]);
-
-    }
-
-    /**
-     * Returns a specific HTTP header, based on it's name.
-     *
-     * The name must be treated as case-insensitive.
-     * If the header does not exist, this method must return null.
-     *
-     * If a header appeared more than once in a HTTP request, this method will
-     * concatenate all the values with a comma.
-     *
-     * Note that this not make sense for all headers. Some, such as
-     * `Set-Cookie` cannot be logically combined with a comma. In those cases
-     * you *should* use getHeaderAsArray().
-     *
-     * @param string $name
-     * @return string|null
-     */
-    public function getHeader($name) {
-
-        $name = strtolower($name);
-
-        if (isset($this->headers[$name])) {
-            return implode(',', $this->headers[$name][1]);
-        }
-        return null;
-
-    }
-
-    /**
-     * Returns a HTTP header as an array.
-     *
-     * For every time the HTTP header appeared in the request or response, an
-     * item will appear in the array.
-     *
-     * If the header did not exists, this method will return an empty array.
-     *
-     * @param string $name
-     * @return string[]
-     */
-    public function getHeaderAsArray($name) {
-
-        $name = strtolower($name);
-
-        if (isset($this->headers[$name])) {
-            return $this->headers[$name][1];
-        }
-
-        return [];
-
-    }
-
-    /**
-     * Updates a HTTP header.
-     *
-     * The case-sensitity of the name value must be retained as-is.
-     *
-     * If the header already existed, it will be overwritten.
-     *
-     * @param string $name
-     * @param string|string[] $value
-     * @return void
-     */
-    public function setHeader($name, $value) {
-
-        $this->headers[strtolower($name)] = [$name, (array)$value];
-
-    }
-
-    /**
-     * Sets a new set of HTTP headers.
-     *
-     * The headers array should contain headernames for keys, and their value
-     * should be specified as either a string or an array.
-     *
-     * Any header that already existed will be overwritten.
-     *
-     * @param array $headers
-     * @return void
-     */
-    public function setHeaders(array $headers) {
-
-        foreach ($headers as $name => $value) {
-            $this->setHeader($name, $value);
-        }
-
-    }
-
-    /**
-     * Adds a HTTP header.
-     *
-     * This method will not overwrite any existing HTTP header, but instead add
-     * another value. Individual values can be retrieved with
-     * getHeadersAsArray.
-     *
-     * @param string $name
-     * @param string $value
-     * @return void
-     */
-    public function addHeader($name, $value) {
-
-        $lName = strtolower($name);
-        if (isset($this->headers[$lName])) {
-            $this->headers[$lName][1] = array_merge(
-                $this->headers[$lName][1],
-                (array)$value
-            );
-        } else {
-            $this->headers[$lName] = [
-                $name,
-                (array)$value
-            ];
-        }
-
-    }
-
-    /**
-     * Adds a new set of HTTP headers.
-     *
-     * Any existing headers will not be overwritten.
-     *
-     * @param array $headers
-     * @return void
-     */
-    public function addHeaders(array $headers) {
-
-        foreach ($headers as $name => $value) {
-            $this->addHeader($name, $value);
-        }
-
-    }
-
-
-    /**
-     * Removes a HTTP header.
-     *
-     * The specified header name must be treated as case-insenstive.
-     * This method should return true if the header was successfully deleted,
-     * and false if the header did not exist.
-     *
-     * @return bool
-     */
-    public function removeHeader($name) {
-
-        $name = strtolower($name);
-        if (!isset($this->headers[$name])) {
-            return false;
-        }
-        unset($this->headers[$name]);
-        return true;
-
-    }
-
-    /**
-     * Sets the HTTP version.
-     *
-     * Should be 1.0 or 1.1.
-     *
-     * @param string $version
-     * @return void
-     */
-    public function setHttpVersion($version) {
-
-        $this->httpVersion = $version;
-
-    }
-
-    /**
-     * Returns the HTTP version.
-     *
-     * @return string
-     */
-    public function getHttpVersion() {
-
-        return $this->httpVersion;
-
-    }
+	/**
+	 * Request body
+	 *
+	 * This should be a stream resource
+	 *
+	 * @var resource
+	 */
+	protected $body;
+
+	/**
+	 * Contains the list of HTTP headers
+	 *
+	 * @var array
+	 */
+	protected $headers = [];
+
+	/**
+	 * HTTP message version (1.0 or 1.1)
+	 *
+	 * @var string
+	 */
+	protected $httpVersion = '1.1';
+
+	/**
+	 * Returns the body as a readable stream resource.
+	 *
+	 * Note that the stream may not be rewindable, and therefore may only be
+	 * read once.
+	 *
+	 * @return resource
+	 */
+	public function getBodyAsStream() {
+
+		$body = $this->getBody();
+		if (is_string($body) || is_null($body)) {
+			$stream = fopen('php://temp', 'r+');
+			fwrite($stream, $body);
+			rewind($stream);
+			return $stream;
+		}
+		return $body;
+
+	}
+
+	/**
+	 * Returns the body as a string.
+	 *
+	 * Note that because the underlying data may be based on a stream, this
+	 * method could only work correctly the first time.
+	 *
+	 * @return string
+	 */
+	public function getBodyAsString() {
+
+		$body = $this->getBody();
+		if (is_string($body)) {
+			return $body;
+		}
+		if (is_null($body)) {
+			return '';
+		}
+		$contentLength = $this->getHeader('Content-Length');
+		if (null === $contentLength) {
+			return stream_get_contents($body);
+		} else {
+			return stream_get_contents($body, $contentLength);
+		}
+
+	}
+
+	/**
+	 * Returns the message body, as it's internal representation.
+	 *
+	 * This could be either a string or a stream.
+	 *
+	 * @return resource|string
+	 */
+	public function getBody() {
+
+		return $this->body;
+
+	}
+
+	/**
+	 * Replaces the body resource with a new stream or string.
+	 *
+	 * @param resource|string $body
+	 */
+	public function setBody($body) {
+
+		$this->body = $body;
+
+	}
+
+	/**
+	 * Returns all the HTTP headers as an array.
+	 *
+	 * Every header is returned as an array, with one or more values.
+	 *
+	 * @return array
+	 */
+	public function getHeaders() {
+
+		$result = [];
+		foreach ($this->headers as $headerInfo) {
+			$result[$headerInfo[0]] = $headerInfo[1];
+		}
+		return $result;
+
+	}
+
+	/**
+	 * Will return true or false, depending on if a HTTP header exists.
+	 *
+	 * @param string $name
+	 * @return bool
+	 */
+	public function hasHeader($name) {
+
+		return isset($this->headers[strtolower($name)]);
+
+	}
+
+	/**
+	 * Returns a specific HTTP header, based on it's name.
+	 *
+	 * The name must be treated as case-insensitive.
+	 * If the header does not exist, this method must return null.
+	 *
+	 * If a header appeared more than once in a HTTP request, this method will
+	 * concatenate all the values with a comma.
+	 *
+	 * Note that this not make sense for all headers. Some, such as
+	 * `Set-Cookie` cannot be logically combined with a comma. In those cases
+	 * you *should* use getHeaderAsArray().
+	 *
+	 * @param string $name
+	 * @return string|null
+	 */
+	public function getHeader($name) {
+
+		$name = strtolower($name);
+
+		if (isset($this->headers[$name])) {
+			return implode(',', $this->headers[$name][1]);
+		}
+		return null;
+
+	}
+
+	/**
+	 * Returns a HTTP header as an array.
+	 *
+	 * For every time the HTTP header appeared in the request or response, an
+	 * item will appear in the array.
+	 *
+	 * If the header did not exists, this method will return an empty array.
+	 *
+	 * @param string $name
+	 * @return string[]
+	 */
+	public function getHeaderAsArray($name) {
+
+		$name = strtolower($name);
+
+		if (isset($this->headers[$name])) {
+			return $this->headers[$name][1];
+		}
+
+		return [];
+
+	}
+
+	/**
+	 * Updates a HTTP header.
+	 *
+	 * The case-sensitity of the name value must be retained as-is.
+	 *
+	 * If the header already existed, it will be overwritten.
+	 *
+	 * @param string $name
+	 * @param string|string[] $value
+	 * @return void
+	 */
+	public function setHeader($name, $value) {
+
+		$this->headers[strtolower($name)] = [$name, (array)$value];
+
+	}
+
+	/**
+	 * Sets a new set of HTTP headers.
+	 *
+	 * The headers array should contain headernames for keys, and their value
+	 * should be specified as either a string or an array.
+	 *
+	 * Any header that already existed will be overwritten.
+	 *
+	 * @param array $headers
+	 * @return void
+	 */
+	public function setHeaders(array $headers) {
+
+		foreach ($headers as $name => $value) {
+			$this->setHeader($name, $value);
+		}
+
+	}
+
+	/**
+	 * Adds a HTTP header.
+	 *
+	 * This method will not overwrite any existing HTTP header, but instead add
+	 * another value. Individual values can be retrieved with
+	 * getHeadersAsArray.
+	 *
+	 * @param string $name
+	 * @param string $value
+	 * @return void
+	 */
+	public function addHeader($name, $value) {
+
+		$lName = strtolower($name);
+		if (isset($this->headers[$lName])) {
+			$this->headers[$lName][1] = array_merge(
+				$this->headers[$lName][1],
+				(array)$value
+			);
+		} else {
+			$this->headers[$lName] = [
+				$name,
+				(array)$value
+			];
+		}
+
+	}
+
+	/**
+	 * Adds a new set of HTTP headers.
+	 *
+	 * Any existing headers will not be overwritten.
+	 *
+	 * @param array $headers
+	 * @return void
+	 */
+	public function addHeaders(array $headers) {
+
+		foreach ($headers as $name => $value) {
+			$this->addHeader($name, $value);
+		}
+
+	}
+
+
+	/**
+	 * Removes a HTTP header.
+	 *
+	 * The specified header name must be treated as case-insenstive.
+	 * This method should return true if the header was successfully deleted,
+	 * and false if the header did not exist.
+	 *
+	 * @return bool
+	 */
+	public function removeHeader($name) {
+
+		$name = strtolower($name);
+		if (!isset($this->headers[$name])) {
+			return false;
+		}
+		unset($this->headers[$name]);
+		return true;
+
+	}
+
+	/**
+	 * Sets the HTTP version.
+	 *
+	 * Should be 1.0 or 1.1.
+	 *
+	 * @param string $version
+	 * @return void
+	 */
+	public function setHttpVersion($version) {
+
+		$this->httpVersion = $version;
+
+	}
+
+	/**
+	 * Returns the HTTP version.
+	 *
+	 * @return string
+	 */
+	public function getHttpVersion() {
+
+		return $this->httpVersion;
+
+	}
 }

libraries/SabreDAV/HTTP/Client.php

Indentation +519 added lines, -519 removed lines

@@ -43,557 +43,557 @@
  */
 class Client extends EventEmitter {
 
-    /**
-     * List of curl settings
-     *
-     * @var array
-     */
-    protected $curlSettings = [];
+	/**
+	 * List of curl settings
+	 *
+	 * @var array
+	 */
+	protected $curlSettings = [];
 
-    /**
-     * Wether or not exceptions should be thrown when a HTTP error is returned.
-     *
-     * @var bool
-     */
-    protected $throwExceptions = false;
+	/**
+	 * Wether or not exceptions should be thrown when a HTTP error is returned.
+	 *
+	 * @var bool
+	 */
+	protected $throwExceptions = false;
 
-    /**
-     * The maximum number of times we'll follow a redirect.
-     *
-     * @var int
-     */
-    protected $maxRedirects = 5;
+	/**
+	 * The maximum number of times we'll follow a redirect.
+	 *
+	 * @var int
+	 */
+	protected $maxRedirects = 5;
 
-    /**
-     * Initializes the client.
-     *
-     * @return void
-     */
-    public function __construct() {
+	/**
+	 * Initializes the client.
+	 *
+	 * @return void
+	 */
+	public function __construct() {
 
-        $this->curlSettings = [
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_HEADER         => true,
-            CURLOPT_NOBODY         => false,
-            CURLOPT_USERAGENT      => 'sabre-http/' . Version::VERSION . ' (http://sabre.io/)',
-        ];
+		$this->curlSettings = [
+			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_HEADER         => true,
+			CURLOPT_NOBODY         => false,
+			CURLOPT_USERAGENT      => 'sabre-http/' . Version::VERSION . ' (http://sabre.io/)',
+		];
 
-    }
+	}
 
-    /**
-     * Sends a request to a HTTP server, and returns a response.
-     *
-     * @param RequestInterface $request
-     * @return ResponseInterface
-     */
-    public function send(RequestInterface $request) {
+	/**
+	 * Sends a request to a HTTP server, and returns a response.
+	 *
+	 * @param RequestInterface $request
+	 * @return ResponseInterface
+	 */
+	public function send(RequestInterface $request) {
 
-        $this->emit('beforeRequest', [$request]);
+		$this->emit('beforeRequest', [$request]);
 
-        $retryCount = 0;
-        $redirects = 0;
+		$retryCount = 0;
+		$redirects = 0;
 
-        do {
-
-            $doRedirect = false;
-            $retry = false;
+		do {
+
+			$doRedirect = false;
+			$retry = false;
 
-            try {
-
-                $response = $this->doRequest($request);
-
-                $code = (int)$response->getStatus();
-
-                // We are doing in-PHP redirects, because curl's
-                // FOLLOW_LOCATION throws errors when PHP is configured with
-                // open_basedir.
-                //
-                // https://github.com/fruux/sabre-http/issues/12
-                if (in_array($code, [301, 302, 307, 308]) && $redirects < $this->maxRedirects) {
-
-                    $oldLocation = $request->getUrl();
-
-                    // Creating a new instance of the request object.
-                    $request = clone $request;
-
-                    // Setting the new location
-                    $request->setUrl(Uri\resolve(
-                        $oldLocation,
-                        $response->getHeader('Location')
-                    ));
+			try {
+
+				$response = $this->doRequest($request);
+
+				$code = (int)$response->getStatus();
+
+				// We are doing in-PHP redirects, because curl's
+				// FOLLOW_LOCATION throws errors when PHP is configured with
+				// open_basedir.
+				//
+				// https://github.com/fruux/sabre-http/issues/12
+				if (in_array($code, [301, 302, 307, 308]) && $redirects < $this->maxRedirects) {
+
+					$oldLocation = $request->getUrl();
+
+					// Creating a new instance of the request object.
+					$request = clone $request;
+
+					// Setting the new location
+					$request->setUrl(Uri\resolve(
+						$oldLocation,
+						$response->getHeader('Location')
+					));
 
-                    $doRedirect = true;
-                    $redirects++;
-
-                }
-
-                // This was a HTTP error
-                if ($code >= 400) {
-
-                    $this->emit('error', [$request, $response, &$retry, $retryCount]);
-                    $this->emit('error:' . $code, [$request, $response, &$retry, $retryCount]);
-
-                }
-
-            } catch (ClientException $e) {
-
-                $this->emit('exception', [$request, $e, &$retry, $retryCount]);
-
-                // If retry was still set to false, it means no event handler
-                // dealt with the problem. In this case we just re-throw the
-                // exception.
-                if (!$retry) {
-                    throw $e;
-                }
-
-            }
-
-            if ($retry) {
-                $retryCount++;
-            }
+					$doRedirect = true;
+					$redirects++;
+
+				}
+
+				// This was a HTTP error
+				if ($code >= 400) {
+
+					$this->emit('error', [$request, $response, &$retry, $retryCount]);
+					$this->emit('error:' . $code, [$request, $response, &$retry, $retryCount]);
+
+				}
+
+			} catch (ClientException $e) {
+
+				$this->emit('exception', [$request, $e, &$retry, $retryCount]);
+
+				// If retry was still set to false, it means no event handler
+				// dealt with the problem. In this case we just re-throw the
+				// exception.
+				if (!$retry) {
+					throw $e;
+				}
+
+			}
+
+			if ($retry) {
+				$retryCount++;
+			}
 
-        } while ($retry || $doRedirect);
+		} while ($retry || $doRedirect);
 
-        $this->emit('afterRequest', [$request, $response]);
+		$this->emit('afterRequest', [$request, $response]);
 
-        if ($this->throwExceptions && $code >= 400) {
-            throw new ClientHttpException($response);
-        }
+		if ($this->throwExceptions && $code >= 400) {
+			throw new ClientHttpException($response);
+		}
 
-        return $response;
+		return $response;
 
-    }
+	}
 
-    /**
-     * Sends a HTTP request asynchronously.
-     *
-     * Due to the nature of PHP, you must from time to time poll to see if any
-     * new responses came in.
-     *
-     * After calling sendAsync, you must therefore occasionally call the poll()
-     * method, or wait().
-     *
-     * @param RequestInterface $request
-     * @param callable $success
-     * @param callable $error
-     * @return void
-     */
-    public function sendAsync(RequestInterface $request, callable $success = null, callable $error = null) {
+	/**
+	 * Sends a HTTP request asynchronously.
+	 *
+	 * Due to the nature of PHP, you must from time to time poll to see if any
+	 * new responses came in.
+	 *
+	 * After calling sendAsync, you must therefore occasionally call the poll()
+	 * method, or wait().
+	 *
+	 * @param RequestInterface $request
+	 * @param callable $success
+	 * @param callable $error
+	 * @return void
+	 */
+	public function sendAsync(RequestInterface $request, callable $success = null, callable $error = null) {
 
-        $this->emit('beforeRequest', [$request]);
-        $this->sendAsyncInternal($request, $success, $error);
-        $this->poll();
+		$this->emit('beforeRequest', [$request]);
+		$this->sendAsyncInternal($request, $success, $error);
+		$this->poll();
 
-    }
+	}
 
 
-    /**
-     * This method checks if any http requests have gotten results, and if so,
-     * call the appropriate success or error handlers.
-     *
-     * This method will return true if there are still requests waiting to
-     * return, and false if all the work is done.
-     *
-     * @return bool
-     */
-    public function poll() {
+	/**
+	 * This method checks if any http requests have gotten results, and if so,
+	 * call the appropriate success or error handlers.
+	 *
+	 * This method will return true if there are still requests waiting to
+	 * return, and false if all the work is done.
+	 *
+	 * @return bool
+	 */
+	public function poll() {
 
-        // nothing to do?
-        if (!$this->curlMultiMap) {
-            return false;
-        }
+		// nothing to do?
+		if (!$this->curlMultiMap) {
+			return false;
+		}
 
-        do {
-            $r = curl_multi_exec(
-                $this->curlMultiHandle,
-                $stillRunning
-            );
-        } while ($r === CURLM_CALL_MULTI_PERFORM);
+		do {
+			$r = curl_multi_exec(
+				$this->curlMultiHandle,
+				$stillRunning
+			);
+		} while ($r === CURLM_CALL_MULTI_PERFORM);
 
-        do {
+		do {
 
-            messageQueue:
+			messageQueue:
 
-            $status = curl_multi_info_read(
-                $this->curlMultiHandle,
-                $messagesInQueue
-            );
+			$status = curl_multi_info_read(
+				$this->curlMultiHandle,
+				$messagesInQueue
+			);
 
-            if ($status && $status['msg'] === CURLMSG_DONE) {
+			if ($status && $status['msg'] === CURLMSG_DONE) {
 
-                $resourceId = intval($status['handle']);
-                list(
-                    $request,
-                    $successCallback,
-                    $errorCallback,
-                    $retryCount,
-                ) = $this->curlMultiMap[$resourceId];
-                unset($this->curlMultiMap[$resourceId]);
-                $curlResult = $this->parseCurlResult(curl_multi_getcontent($status['handle']), $status['handle']);
-                $retry = false;
+				$resourceId = intval($status['handle']);
+				list(
+					$request,
+					$successCallback,
+					$errorCallback,
+					$retryCount,
+				) = $this->curlMultiMap[$resourceId];
+				unset($this->curlMultiMap[$resourceId]);
+				$curlResult = $this->parseCurlResult(curl_multi_getcontent($status['handle']), $status['handle']);
+				$retry = false;
 
-                if ($curlResult['status'] === self::STATUS_CURLERROR) {
+				if ($curlResult['status'] === self::STATUS_CURLERROR) {
 
-                    $e = new ClientException($curlResult['curl_errmsg'], $curlResult['curl_errno']);
-                    $this->emit('exception', [$request, $e, &$retry, $retryCount]);
+					$e = new ClientException($curlResult['curl_errmsg'], $curlResult['curl_errno']);
+					$this->emit('exception', [$request, $e, &$retry, $retryCount]);
 
-                    if ($retry) {
-                        $retryCount++;
-                        $this->sendAsyncInternal($request, $successCallback, $errorCallback, $retryCount);
-                        goto messageQueue;
-                    }
-
-                    $curlResult['request'] = $request;
+					if ($retry) {
+						$retryCount++;
+						$this->sendAsyncInternal($request, $successCallback, $errorCallback, $retryCount);
+						goto messageQueue;
+					}
+
+					$curlResult['request'] = $request;
 
-                    if ($errorCallback) {
-                        $errorCallback($curlResult);
-                    }
-
-                } elseif ($curlResult['status'] === self::STATUS_HTTPERROR) {
-
-                    $this->emit('error', [$request, $curlResult['response'], &$retry, $retryCount]);
-                    $this->emit('error:' . $curlResult['http_code'], [$request, $curlResult['response'], &$retry, $retryCount]);
-
-                    if ($retry) {
-
-                        $retryCount++;
-                        $this->sendAsyncInternal($request, $successCallback, $errorCallback, $retryCount);
-                        goto messageQueue;
+					if ($errorCallback) {
+						$errorCallback($curlResult);
+					}
+
+				} elseif ($curlResult['status'] === self::STATUS_HTTPERROR) {
+
+					$this->emit('error', [$request, $curlResult['response'], &$retry, $retryCount]);
+					$this->emit('error:' . $curlResult['http_code'], [$request, $curlResult['response'], &$retry, $retryCount]);
+
+					if ($retry) {
+
+						$retryCount++;
+						$this->sendAsyncInternal($request, $successCallback, $errorCallback, $retryCount);
+						goto messageQueue;
 
-                    }
-
-                    $curlResult['request'] = $request;
-
-                    if ($errorCallback) {
-                        $errorCallback($curlResult);
-                    }
-
-                } else {
-
-                    $this->emit('afterRequest', [$request, $curlResult['response']]);
-
-                    if ($successCallback) {
-                        $successCallback($curlResult['response']);
-                    }
-
-                }
-            }
-
-        } while ($messagesInQueue > 0);
-
-        return count($this->curlMultiMap) > 0;
-
-    }
-
-    /**
-     * Processes every HTTP request in the queue, and waits till they are all
-     * completed.
-     *
-     * @return void
-     */
-    public function wait() {
-
-        do {
-            curl_multi_select($this->curlMultiHandle);
-            $stillRunning = $this->poll();
-        } while ($stillRunning);
-
-    }
-
-    /**
-     * If this is set to true, the Client will automatically throw exceptions
-     * upon HTTP errors.
-     *
-     * This means that if a response came back with a status code greater than
-     * or equal to 400, we will throw a ClientHttpException.
-     *
-     * This only works for the send() method. Throwing exceptions for
-     * sendAsync() is not supported.
-     *
-     * @param bool $throwExceptions
-     * @return void
-     */
-    public function setThrowExceptions($throwExceptions) {
-
-        $this->throwExceptions = $throwExceptions;
-
-    }
-
-    /**
-     * Adds a CURL setting.
-     *
-     * These settings will be included in every HTTP request.
-     *
-     * @param int $name
-     * @param mixed $value
-     * @return void
-     */
-    public function addCurlSetting($name, $value) {
-
-        $this->curlSettings[$name] = $value;
-
-    }
-
-    /**
-     * This method is responsible for performing a single request.
-     *
-     * @param RequestInterface $request
-     * @return ResponseInterface
-     */
-    protected function doRequest(RequestInterface $request) {
-
-        $settings = $this->createCurlSettingsArray($request);
-
-        if (!$this->curlHandle) {
-            $this->curlHandle = curl_init();
-        }
-
-        curl_setopt_array($this->curlHandle, $settings);
-        $response = $this->curlExec($this->curlHandle);
-        $response = $this->parseCurlResult($response, $this->curlHandle);
-
-        if ($response['status'] === self::STATUS_CURLERROR) {
-            throw new ClientException($response['curl_errmsg'], $response['curl_errno']);
-        }
-
-        return $response['response'];
-
-    }
-
-    /**
-     * Cached curl handle.
-     *
-     * By keeping this resource around for the lifetime of this object, things
-     * like persistent connections are possible.
-     *
-     * @var resource
-     */
-    private $curlHandle;
-
-    /**
-     * Handler for curl_multi requests.
-     *
-     * The first time sendAsync is used, this will be created.
-     *
-     * @var resource
-     */
-    private $curlMultiHandle;
-
-    /**
-     * Has a list of curl handles, as well as their associated success and
-     * error callbacks.
-     *
-     * @var array
-     */
-    private $curlMultiMap = [];
-
-    /**
-     * Turns a RequestInterface object into an array with settings that can be
-     * fed to curl_setopt
-     *
-     * @param RequestInterface $request
-     * @return array
-     */
-    protected function createCurlSettingsArray(RequestInterface $request) {
-
-        $settings = $this->curlSettings;
-
-        switch ($request->getMethod()) {
-            case 'HEAD' :
-                $settings[CURLOPT_NOBODY] = true;
-                $settings[CURLOPT_CUSTOMREQUEST] = 'HEAD';
-                $settings[CURLOPT_POSTFIELDS] = '';
-                $settings[CURLOPT_PUT] = false;
-                break;
-            case 'GET' :
-                $settings[CURLOPT_CUSTOMREQUEST] = 'GET';
-                $settings[CURLOPT_POSTFIELDS] = '';
-                $settings[CURLOPT_PUT] = false;
-                break;
-            default :
-                $body = $request->getBody();
-                if (is_resource($body)) {
-                    // This needs to be set to PUT, regardless of the actual
-                    // method used. Without it, INFILE will be ignored for some
-                    // reason.
-                    $settings[CURLOPT_PUT] = true;
-                    $settings[CURLOPT_INFILE] = $request->getBody();
-                } else {
-                    // For security we cast this to a string. If somehow an array could
-                    // be passed here, it would be possible for an attacker to use @ to
-                    // post local files.
-                    $settings[CURLOPT_POSTFIELDS] = (string)$body;
-                }
-                $settings[CURLOPT_CUSTOMREQUEST] = $request->getMethod();
-                break;
-
-        }
-
-        $nHeaders = [];
-        foreach ($request->getHeaders() as $key => $values) {
-
-            foreach ($values as $value) {
-                $nHeaders[] = $key . ': ' . $value;
-            }
-
-        }
-        $settings[CURLOPT_HTTPHEADER] = $nHeaders;
-        $settings[CURLOPT_URL] = $request->getUrl();
-        if (defined('CURLOPT_PROTOCOLS')) {
-            $settings[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
-        }
-        if (defined('CURLOPT_REDIR_PROTOCOLS')) {
-            $settings[CURLOPT_REDIR_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
-        }
-
-        return $settings;
-
-    }
-
-    const STATUS_SUCCESS = 0;
-    const STATUS_CURLERROR = 1;
-    const STATUS_HTTPERROR = 2;
-
-    /**
-     * Parses the result of a curl call in a format that's a bit more
-     * convenient to work with.
-     *
-     * The method returns an array with the following elements:
-     *   * status - one of the 3 STATUS constants.
-     *   * curl_errno - A curl error number. Only set if status is
-     *                  STATUS_CURLERROR.
-     *   * curl_errmsg - A current error message. Only set if status is
-     *                   STATUS_CURLERROR.
-     *   * response - Response object. Only set if status is STATUS_SUCCESS, or
-     *                STATUS_HTTPERROR.
-     *   * http_code - HTTP status code, as an int. Only set if Only set if
-     *                 status is STATUS_SUCCESS, or STATUS_HTTPERROR
-     *
-     * @param string $response
-     * @param resource $curlHandle
-     * @return Response
-     */
-    protected function parseCurlResult($response, $curlHandle) {
-
-        list(
-            $curlInfo,
-            $curlErrNo,
-            $curlErrMsg
-        ) = $this->curlStuff($curlHandle);
-
-        if ($curlErrNo) {
-            return [
-                'status'      => self::STATUS_CURLERROR,
-                'curl_errno'  => $curlErrNo,
-                'curl_errmsg' => $curlErrMsg,
-            ];
-        }
-
-        $headerBlob = substr($response, 0, $curlInfo['header_size']);
-        // In the case of 204 No Content, strlen($response) == $curlInfo['header_size].
-        // This will cause substr($response, $curlInfo['header_size']) return FALSE instead of NULL
-        // An exception will be thrown when calling getBodyAsString then
-        $responseBody = substr($response, $curlInfo['header_size']) ?: null;
-
-        unset($response);
-
-        // In the case of 100 Continue, or redirects we'll have multiple lists
-        // of headers for each separate HTTP response. We can easily split this
-        // because they are separated by \r\n\r\n
-        $headerBlob = explode("\r\n\r\n", trim($headerBlob, "\r\n"));
-
-        // We only care about the last set of headers
-        $headerBlob = $headerBlob[count($headerBlob) - 1];
-
-        // Splitting headers
-        $headerBlob = explode("\r\n", $headerBlob);
-
-        $response = new Response();
-        $response->setStatus($curlInfo['http_code']);
-
-        foreach ($headerBlob as $header) {
-            $parts = explode(':', $header, 2);
-            if (count($parts) == 2) {
-                $response->addHeader(trim($parts[0]), trim($parts[1]));
-            }
-        }
-
-        $response->setBody($responseBody);
-
-        $httpCode = intval($response->getStatus());
-
-        return [
-            'status'    => $httpCode >= 400 ? self::STATUS_HTTPERROR : self::STATUS_SUCCESS,
-            'response'  => $response,
-            'http_code' => $httpCode,
-        ];
-
-    }
-
-    /**
-     * Sends an asynchronous HTTP request.
-     *
-     * We keep this in a separate method, so we can call it without triggering
-     * the beforeRequest event and don't do the poll().
-     *
-     * @param RequestInterface $request
-     * @param callable $success
-     * @param callable $error
-     * @param int $retryCount
-     */
-    protected function sendAsyncInternal(RequestInterface $request, callable $success, callable $error, $retryCount = 0) {
-
-        if (!$this->curlMultiHandle) {
-            $this->curlMultiHandle = curl_multi_init();
-        }
-        $curl = curl_init();
-        curl_setopt_array(
-            $curl,
-            $this->createCurlSettingsArray($request)
-        );
-        curl_multi_add_handle($this->curlMultiHandle, $curl);
-        $this->curlMultiMap[intval($curl)] = [
-            $request,
-            $success,
-            $error,
-            $retryCount
-        ];
-
-    }
-
-    // @codeCoverageIgnoreStart
-
-    /**
-     * Calls curl_exec
-     *
-     * This method exists so it can easily be overridden and mocked.
-     *
-     * @param resource $curlHandle
-     * @return string
-     */
-    protected function curlExec($curlHandle) {
-
-        return curl_exec($curlHandle);
-
-    }
-
-    /**
-     * Returns a bunch of information about a curl request.
-     *
-     * This method exists so it can easily be overridden and mocked.
-     *
-     * @param resource $curlHandle
-     * @return array
-     */
-    protected function curlStuff($curlHandle) {
-
-        return [
-            curl_getinfo($curlHandle),
-            curl_errno($curlHandle),
-            curl_error($curlHandle),
-        ];
-
-    }
-    // @codeCoverageIgnoreEnd
+					}
+
+					$curlResult['request'] = $request;
+
+					if ($errorCallback) {
+						$errorCallback($curlResult);
+					}
+
+				} else {
+
+					$this->emit('afterRequest', [$request, $curlResult['response']]);
+
+					if ($successCallback) {
+						$successCallback($curlResult['response']);
+					}
+
+				}
+			}
+
+		} while ($messagesInQueue > 0);
+
+		return count($this->curlMultiMap) > 0;
+
+	}
+
+	/**
+	 * Processes every HTTP request in the queue, and waits till they are all
+	 * completed.
+	 *
+	 * @return void
+	 */
+	public function wait() {
+
+		do {
+			curl_multi_select($this->curlMultiHandle);
+			$stillRunning = $this->poll();
+		} while ($stillRunning);
+
+	}
+
+	/**
+	 * If this is set to true, the Client will automatically throw exceptions
+	 * upon HTTP errors.
+	 *
+	 * This means that if a response came back with a status code greater than
+	 * or equal to 400, we will throw a ClientHttpException.
+	 *
+	 * This only works for the send() method. Throwing exceptions for
+	 * sendAsync() is not supported.
+	 *
+	 * @param bool $throwExceptions
+	 * @return void
+	 */
+	public function setThrowExceptions($throwExceptions) {
+
+		$this->throwExceptions = $throwExceptions;
+
+	}
+
+	/**
+	 * Adds a CURL setting.
+	 *
+	 * These settings will be included in every HTTP request.
+	 *
+	 * @param int $name
+	 * @param mixed $value
+	 * @return void
+	 */
+	public function addCurlSetting($name, $value) {
+
+		$this->curlSettings[$name] = $value;
+
+	}
+
+	/**
+	 * This method is responsible for performing a single request.
+	 *
+	 * @param RequestInterface $request
+	 * @return ResponseInterface
+	 */
+	protected function doRequest(RequestInterface $request) {
+
+		$settings = $this->createCurlSettingsArray($request);
+
+		if (!$this->curlHandle) {
+			$this->curlHandle = curl_init();
+		}
+
+		curl_setopt_array($this->curlHandle, $settings);
+		$response = $this->curlExec($this->curlHandle);
+		$response = $this->parseCurlResult($response, $this->curlHandle);
+
+		if ($response['status'] === self::STATUS_CURLERROR) {
+			throw new ClientException($response['curl_errmsg'], $response['curl_errno']);
+		}
+
+		return $response['response'];
+
+	}
+
+	/**
+	 * Cached curl handle.
+	 *
+	 * By keeping this resource around for the lifetime of this object, things
+	 * like persistent connections are possible.
+	 *
+	 * @var resource
+	 */
+	private $curlHandle;
+
+	/**
+	 * Handler for curl_multi requests.
+	 *
+	 * The first time sendAsync is used, this will be created.
+	 *
+	 * @var resource
+	 */
+	private $curlMultiHandle;
+
+	/**
+	 * Has a list of curl handles, as well as their associated success and
+	 * error callbacks.
+	 *
+	 * @var array
+	 */
+	private $curlMultiMap = [];
+
+	/**
+	 * Turns a RequestInterface object into an array with settings that can be
+	 * fed to curl_setopt
+	 *
+	 * @param RequestInterface $request
+	 * @return array
+	 */
+	protected function createCurlSettingsArray(RequestInterface $request) {
+
+		$settings = $this->curlSettings;
+
+		switch ($request->getMethod()) {
+			case 'HEAD' :
+				$settings[CURLOPT_NOBODY] = true;
+				$settings[CURLOPT_CUSTOMREQUEST] = 'HEAD';
+				$settings[CURLOPT_POSTFIELDS] = '';
+				$settings[CURLOPT_PUT] = false;
+				break;
+			case 'GET' :
+				$settings[CURLOPT_CUSTOMREQUEST] = 'GET';
+				$settings[CURLOPT_POSTFIELDS] = '';
+				$settings[CURLOPT_PUT] = false;
+				break;
+			default :
+				$body = $request->getBody();
+				if (is_resource($body)) {
+					// This needs to be set to PUT, regardless of the actual
+					// method used. Without it, INFILE will be ignored for some
+					// reason.
+					$settings[CURLOPT_PUT] = true;
+					$settings[CURLOPT_INFILE] = $request->getBody();
+				} else {
+					// For security we cast this to a string. If somehow an array could
+					// be passed here, it would be possible for an attacker to use @ to
+					// post local files.
+					$settings[CURLOPT_POSTFIELDS] = (string)$body;
+				}
+				$settings[CURLOPT_CUSTOMREQUEST] = $request->getMethod();
+				break;
+
+		}
+
+		$nHeaders = [];
+		foreach ($request->getHeaders() as $key => $values) {
+
+			foreach ($values as $value) {
+				$nHeaders[] = $key . ': ' . $value;
+			}
+
+		}
+		$settings[CURLOPT_HTTPHEADER] = $nHeaders;
+		$settings[CURLOPT_URL] = $request->getUrl();
+		if (defined('CURLOPT_PROTOCOLS')) {
+			$settings[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
+		}
+		if (defined('CURLOPT_REDIR_PROTOCOLS')) {
+			$settings[CURLOPT_REDIR_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
+		}
+
+		return $settings;
+
+	}
+
+	const STATUS_SUCCESS = 0;
+	const STATUS_CURLERROR = 1;
+	const STATUS_HTTPERROR = 2;
+
+	/**
+	 * Parses the result of a curl call in a format that's a bit more
+	 * convenient to work with.
+	 *
+	 * The method returns an array with the following elements:
+	 *   * status - one of the 3 STATUS constants.
+	 *   * curl_errno - A curl error number. Only set if status is
+	 *                  STATUS_CURLERROR.
+	 *   * curl_errmsg - A current error message. Only set if status is
+	 *                   STATUS_CURLERROR.
+	 *   * response - Response object. Only set if status is STATUS_SUCCESS, or
+	 *                STATUS_HTTPERROR.
+	 *   * http_code - HTTP status code, as an int. Only set if Only set if
+	 *                 status is STATUS_SUCCESS, or STATUS_HTTPERROR
+	 *
+	 * @param string $response
+	 * @param resource $curlHandle
+	 * @return Response
+	 */
+	protected function parseCurlResult($response, $curlHandle) {
+
+		list(
+			$curlInfo,
+			$curlErrNo,
+			$curlErrMsg
+		) = $this->curlStuff($curlHandle);
+
+		if ($curlErrNo) {
+			return [
+				'status'      => self::STATUS_CURLERROR,
+				'curl_errno'  => $curlErrNo,
+				'curl_errmsg' => $curlErrMsg,
+			];
+		}
+
+		$headerBlob = substr($response, 0, $curlInfo['header_size']);
+		// In the case of 204 No Content, strlen($response) == $curlInfo['header_size].
+		// This will cause substr($response, $curlInfo['header_size']) return FALSE instead of NULL
+		// An exception will be thrown when calling getBodyAsString then
+		$responseBody = substr($response, $curlInfo['header_size']) ?: null;
+
+		unset($response);
+
+		// In the case of 100 Continue, or redirects we'll have multiple lists
+		// of headers for each separate HTTP response. We can easily split this
+		// because they are separated by \r\n\r\n
+		$headerBlob = explode("\r\n\r\n", trim($headerBlob, "\r\n"));
+
+		// We only care about the last set of headers
+		$headerBlob = $headerBlob[count($headerBlob) - 1];
+
+		// Splitting headers
+		$headerBlob = explode("\r\n", $headerBlob);
+
+		$response = new Response();
+		$response->setStatus($curlInfo['http_code']);
+
+		foreach ($headerBlob as $header) {
+			$parts = explode(':', $header, 2);
+			if (count($parts) == 2) {
+				$response->addHeader(trim($parts[0]), trim($parts[1]));
+			}
+		}
+
+		$response->setBody($responseBody);
+
+		$httpCode = intval($response->getStatus());
+
+		return [
+			'status'    => $httpCode >= 400 ? self::STATUS_HTTPERROR : self::STATUS_SUCCESS,
+			'response'  => $response,
+			'http_code' => $httpCode,
+		];
+
+	}
+
+	/**
+	 * Sends an asynchronous HTTP request.
+	 *
+	 * We keep this in a separate method, so we can call it without triggering
+	 * the beforeRequest event and don't do the poll().
+	 *
+	 * @param RequestInterface $request
+	 * @param callable $success
+	 * @param callable $error
+	 * @param int $retryCount
+	 */
+	protected function sendAsyncInternal(RequestInterface $request, callable $success, callable $error, $retryCount = 0) {
+
+		if (!$this->curlMultiHandle) {
+			$this->curlMultiHandle = curl_multi_init();
+		}
+		$curl = curl_init();
+		curl_setopt_array(
+			$curl,
+			$this->createCurlSettingsArray($request)
+		);
+		curl_multi_add_handle($this->curlMultiHandle, $curl);
+		$this->curlMultiMap[intval($curl)] = [
+			$request,
+			$success,
+			$error,
+			$retryCount
+		];
+
+	}
+
+	// @codeCoverageIgnoreStart
+
+	/**
+	 * Calls curl_exec
+	 *
+	 * This method exists so it can easily be overridden and mocked.
+	 *
+	 * @param resource $curlHandle
+	 * @return string
+	 */
+	protected function curlExec($curlHandle) {
+
+		return curl_exec($curlHandle);
+
+	}
+
+	/**
+	 * Returns a bunch of information about a curl request.
+	 *
+	 * This method exists so it can easily be overridden and mocked.
+	 *
+	 * @param resource $curlHandle
+	 * @return array
+	 */
+	protected function curlStuff($curlHandle) {
+
+		return [
+			curl_getinfo($curlHandle),
+			curl_errno($curlHandle),
+			curl_error($curlHandle),
+		];
+
+	}
+	// @codeCoverageIgnoreEnd
 
 }

libraries/SabreDAV/HTTP/Auth/Bearer.php

Indentation +27 added lines, -27 removed lines

@@ -17,40 +17,40 @@
  */
 class Bearer extends AbstractAuth {
 
-    /**
-     * This method returns a string with an access token.
-     *
-     * If no token was found, this method returns null.
-     *
-     * @return null|string
-     */
-    public function getToken() {
+	/**
+	 * This method returns a string with an access token.
+	 *
+	 * If no token was found, this method returns null.
+	 *
+	 * @return null|string
+	 */
+	public function getToken() {
 
-        $auth = $this->request->getHeader('Authorization');
+		$auth = $this->request->getHeader('Authorization');
 
-        if (!$auth) {
-            return null;
-        }
+		if (!$auth) {
+			return null;
+		}
 
-        if (strtolower(substr($auth, 0, 7)) !== 'bearer ') {
-            return null;
-        }
+		if (strtolower(substr($auth, 0, 7)) !== 'bearer ') {
+			return null;
+		}
 
-        return substr($auth, 7);
+		return substr($auth, 7);
 
-    }
+	}
 
-    /**
-     * This method sends the needed HTTP header and statuscode (401) to force
-     * authentication.
-     *
-     * @return void
-     */
-    public function requireLogin() {
+	/**
+	 * This method sends the needed HTTP header and statuscode (401) to force
+	 * authentication.
+	 *
+	 * @return void
+	 */
+	public function requireLogin() {
 
-        $this->response->addHeader('WWW-Authenticate', 'Bearer realm="' . $this->realm . '"');
-        $this->response->setStatus(401);
+		$this->response->addHeader('WWW-Authenticate', 'Bearer realm="' . $this->realm . '"');
+		$this->response->setStatus(401);
 
-    }
+	}
 
 }

libraries/SabreDAV/HTTP/Auth/Digest.php

Indentation +193 added lines, -193 removed lines

@@ -29,203 +29,203 @@
  */
 class Digest extends AbstractAuth {
 
-    /**
-     * These constants are used in setQOP();
-     */
-    const QOP_AUTH = 1;
-    const QOP_AUTHINT = 2;
-
-    protected $nonce;
-    protected $opaque;
-    protected $digestParts;
-    protected $A1;
-    protected $qop = self::QOP_AUTH;
-
-    /**
-     * Initializes the object
-     */
-    public function __construct($realm = 'SabreTooth', RequestInterface $request, ResponseInterface $response) {
-
-        $this->nonce = uniqid();
-        $this->opaque = md5($realm);
-        parent::__construct($realm, $request, $response);
-
-    }
-
-    /**
-     * Gathers all information from the headers
-     *
-     * This method needs to be called prior to anything else.
-     *
-     * @return void
-     */
-    public function init() {
-
-        $digest = $this->getDigest();
-        $this->digestParts = $this->parseDigest($digest);
-
-    }
-
-    /**
-     * Sets the quality of protection value.
-     *
-     * Possible values are:
-     *   Sabre\HTTP\DigestAuth::QOP_AUTH
-     *   Sabre\HTTP\DigestAuth::QOP_AUTHINT
-     *
-     * Multiple values can be specified using logical OR.
-     *
-     * QOP_AUTHINT ensures integrity of the request body, but this is not
-     * supported by most HTTP clients. QOP_AUTHINT also requires the entire
-     * request body to be md5'ed, which can put strains on CPU and memory.
-     *
-     * @param int $qop
-     * @return void
-     */
-    public function setQOP($qop) {
-
-        $this->qop = $qop;
-
-    }
-
-    /**
-     * Validates the user.
-     *
-     * The A1 parameter should be md5($username . ':' . $realm . ':' . $password);
-     *
-     * @param string $A1
-     * @return bool
-     */
-    public function validateA1($A1) {
-
-        $this->A1 = $A1;
-        return $this->validate();
-
-    }
-
-    /**
-     * Validates authentication through a password. The actual password must be provided here.
-     * It is strongly recommended not store the password in plain-text and use validateA1 instead.
-     *
-     * @param string $password
-     * @return bool
-     */
-    public function validatePassword($password) {
-
-        $this->A1 = md5($this->digestParts['username'] . ':' . $this->realm . ':' . $password);
-        return $this->validate();
-
-    }
-
-    /**
-     * Returns the username for the request
-     *
-     * @return string
-     */
-    public function getUsername() {
-
-        return $this->digestParts['username'];
-
-    }
-
-    /**
-     * Validates the digest challenge
-     *
-     * @return bool
-     */
-    protected function validate() {
-
-        $A2 = $this->request->getMethod() . ':' . $this->digestParts['uri'];
-
-        if ($this->digestParts['qop'] == 'auth-int') {
-            // Making sure we support this qop value
-            if (!($this->qop & self::QOP_AUTHINT)) return false;
-            // We need to add an md5 of the entire request body to the A2 part of the hash
-            $body = $this->request->getBody($asString = true);
-            $this->request->setBody($body);
-            $A2 .= ':' . md5($body);
-        } else {
-
-            // We need to make sure we support this qop value
-            if (!($this->qop & self::QOP_AUTH)) return false;
-        }
-
-        $A2 = md5($A2);
-
-        $validResponse = md5("{$this->A1}:{$this->digestParts['nonce']}:{$this->digestParts['nc']}:{$this->digestParts['cnonce']}:{$this->digestParts['qop']}:{$A2}");
-
-        return $this->digestParts['response'] == $validResponse;
-
-
-    }
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    public function requireLogin() {
-
-        $qop = '';
-        switch ($this->qop) {
-            case self::QOP_AUTH    :
-                $qop = 'auth';
-                break;
-            case self::QOP_AUTHINT :
-                $qop = 'auth-int';
-                break;
-            case self::QOP_AUTH | self::QOP_AUTHINT :
-                $qop = 'auth,auth-int';
-                break;
-        }
-
-        $this->response->addHeader('WWW-Authenticate', 'Digest realm="' . $this->realm . '",qop="' . $qop . '",nonce="' . $this->nonce . '",opaque="' . $this->opaque . '"');
-        $this->response->setStatus(401);
-
-    }
-
-
-    /**
-     * This method returns the full digest string.
-     *
-     * It should be compatibile with mod_php format and other webservers.
-     *
-     * If the header could not be found, null will be returned
-     *
-     * @return mixed
-     */
-    public function getDigest() {
+	/**
+	 * These constants are used in setQOP();
+	 */
+	const QOP_AUTH = 1;
+	const QOP_AUTHINT = 2;
+
+	protected $nonce;
+	protected $opaque;
+	protected $digestParts;
+	protected $A1;
+	protected $qop = self::QOP_AUTH;
+
+	/**
+	 * Initializes the object
+	 */
+	public function __construct($realm = 'SabreTooth', RequestInterface $request, ResponseInterface $response) {
+
+		$this->nonce = uniqid();
+		$this->opaque = md5($realm);
+		parent::__construct($realm, $request, $response);
+
+	}
+
+	/**
+	 * Gathers all information from the headers
+	 *
+	 * This method needs to be called prior to anything else.
+	 *
+	 * @return void
+	 */
+	public function init() {
+
+		$digest = $this->getDigest();
+		$this->digestParts = $this->parseDigest($digest);
+
+	}
+
+	/**
+	 * Sets the quality of protection value.
+	 *
+	 * Possible values are:
+	 *   Sabre\HTTP\DigestAuth::QOP_AUTH
+	 *   Sabre\HTTP\DigestAuth::QOP_AUTHINT
+	 *
+	 * Multiple values can be specified using logical OR.
+	 *
+	 * QOP_AUTHINT ensures integrity of the request body, but this is not
+	 * supported by most HTTP clients. QOP_AUTHINT also requires the entire
+	 * request body to be md5'ed, which can put strains on CPU and memory.
+	 *
+	 * @param int $qop
+	 * @return void
+	 */
+	public function setQOP($qop) {
+
+		$this->qop = $qop;
+
+	}
+
+	/**
+	 * Validates the user.
+	 *
+	 * The A1 parameter should be md5($username . ':' . $realm . ':' . $password);
+	 *
+	 * @param string $A1
+	 * @return bool
+	 */
+	public function validateA1($A1) {
+
+		$this->A1 = $A1;
+		return $this->validate();
+
+	}
+
+	/**
+	 * Validates authentication through a password. The actual password must be provided here.
+	 * It is strongly recommended not store the password in plain-text and use validateA1 instead.
+	 *
+	 * @param string $password
+	 * @return bool
+	 */
+	public function validatePassword($password) {
+
+		$this->A1 = md5($this->digestParts['username'] . ':' . $this->realm . ':' . $password);
+		return $this->validate();
+
+	}
+
+	/**
+	 * Returns the username for the request
+	 *
+	 * @return string
+	 */
+	public function getUsername() {
+
+		return $this->digestParts['username'];
+
+	}
+
+	/**
+	 * Validates the digest challenge
+	 *
+	 * @return bool
+	 */
+	protected function validate() {
+
+		$A2 = $this->request->getMethod() . ':' . $this->digestParts['uri'];
+
+		if ($this->digestParts['qop'] == 'auth-int') {
+			// Making sure we support this qop value
+			if (!($this->qop & self::QOP_AUTHINT)) return false;
+			// We need to add an md5 of the entire request body to the A2 part of the hash
+			$body = $this->request->getBody($asString = true);
+			$this->request->setBody($body);
+			$A2 .= ':' . md5($body);
+		} else {
+
+			// We need to make sure we support this qop value
+			if (!($this->qop & self::QOP_AUTH)) return false;
+		}
+
+		$A2 = md5($A2);
+
+		$validResponse = md5("{$this->A1}:{$this->digestParts['nonce']}:{$this->digestParts['nc']}:{$this->digestParts['cnonce']}:{$this->digestParts['qop']}:{$A2}");
+
+		return $this->digestParts['response'] == $validResponse;
+
+
+	}
+
+	/**
+	 * Returns an HTTP 401 header, forcing login
+	 *
+	 * This should be called when username and password are incorrect, or not supplied at all
+	 *
+	 * @return void
+	 */
+	public function requireLogin() {
+
+		$qop = '';
+		switch ($this->qop) {
+			case self::QOP_AUTH    :
+				$qop = 'auth';
+				break;
+			case self::QOP_AUTHINT :
+				$qop = 'auth-int';
+				break;
+			case self::QOP_AUTH | self::QOP_AUTHINT :
+				$qop = 'auth,auth-int';
+				break;
+		}
+
+		$this->response->addHeader('WWW-Authenticate', 'Digest realm="' . $this->realm . '",qop="' . $qop . '",nonce="' . $this->nonce . '",opaque="' . $this->opaque . '"');
+		$this->response->setStatus(401);
+
+	}
+
+
+	/**
+	 * This method returns the full digest string.
+	 *
+	 * It should be compatibile with mod_php format and other webservers.
+	 *
+	 * If the header could not be found, null will be returned
+	 *
+	 * @return mixed
+	 */
+	public function getDigest() {
 
-        return $this->request->getHeader('Authorization');
-
-    }
-
-
-    /**
-     * Parses the different pieces of the digest string into an array.
-     *
-     * This method returns false if an incomplete digest was supplied
-     *
-     * @param string $digest
-     * @return mixed
-     */
-    protected function parseDigest($digest) {
+		return $this->request->getHeader('Authorization');
+
+	}
+
+
+	/**
+	 * Parses the different pieces of the digest string into an array.
+	 *
+	 * This method returns false if an incomplete digest was supplied
+	 *
+	 * @param string $digest
+	 * @return mixed
+	 */
+	protected function parseDigest($digest) {
 
-        // protect against missing data
-        $needed_parts = ['nonce' => 1, 'nc' => 1, 'cnonce' => 1, 'qop' => 1, 'username' => 1, 'uri' => 1, 'response' => 1];
-        $data = [];
+		// protect against missing data
+		$needed_parts = ['nonce' => 1, 'nc' => 1, 'cnonce' => 1, 'qop' => 1, 'username' => 1, 'uri' => 1, 'response' => 1];
+		$data = [];
 
-        preg_match_all('@(\w+)=(?:(?:")([^"]+)"|([^\s,$]+))@', $digest, $matches, PREG_SET_ORDER);
-
-        foreach ($matches as $m) {
-            $data[$m[1]] = $m[2] ? $m[2] : $m[3];
-            unset($needed_parts[$m[1]]);
-        }
+		preg_match_all('@(\w+)=(?:(?:")([^"]+)"|([^\s,$]+))@', $digest, $matches, PREG_SET_ORDER);
+
+		foreach ($matches as $m) {
+			$data[$m[1]] = $m[2] ? $m[2] : $m[3];
+			unset($needed_parts[$m[1]]);
+		}
 
-        return $needed_parts ? false : $data;
+		return $needed_parts ? false : $data;
 
-    }
+	}
 
 }

libraries/SabreDAV/HTTP/Auth/AWS.php

Indentation +215 added lines, -215 removed lines

@@ -15,220 +15,220 @@
  */
 class AWS extends AbstractAuth {
 
-    /**
-     * The signature supplied by the HTTP client
-     *
-     * @var string
-     */
-    private $signature = null;
-
-    /**
-     * The accesskey supplied by the HTTP client
-     *
-     * @var string
-     */
-    private $accessKey = null;
-
-    /**
-     * An error code, if any
-     *
-     * This value will be filled with one of the ERR_* constants
-     *
-     * @var int
-     */
-    public $errorCode = 0;
-
-    const ERR_NOAWSHEADER = 1;
-    const ERR_MD5CHECKSUMWRONG = 2;
-    const ERR_INVALIDDATEFORMAT = 3;
-    const ERR_REQUESTTIMESKEWED = 4;
-    const ERR_INVALIDSIGNATURE = 5;
-
-    /**
-     * Gathers all information from the headers
-     *
-     * This method needs to be called prior to anything else.
-     *
-     * @return bool
-     */
-    public function init() {
-
-        $authHeader = $this->request->getHeader('Authorization');
-        $authHeader = explode(' ', $authHeader);
-
-        if ($authHeader[0] != 'AWS' || !isset($authHeader[1])) {
-            $this->errorCode = self::ERR_NOAWSHEADER;
-             return false;
-        }
-
-        list($this->accessKey, $this->signature) = explode(':', $authHeader[1]);
-
-        return true;
-
-    }
-
-    /**
-     * Returns the username for the request
-     *
-     * @return string
-     */
-    public function getAccessKey() {
-
-        return $this->accessKey;
-
-    }
-
-    /**
-     * Validates the signature based on the secretKey
-     *
-     * @param string $secretKey
-     * @return bool
-     */
-    public function validate($secretKey) {
-
-        $contentMD5 = $this->request->getHeader('Content-MD5');
-
-        if ($contentMD5) {
-            // We need to validate the integrity of the request
-            $body = $this->request->getBody();
-            $this->request->setBody($body);
-
-            if ($contentMD5 != base64_encode(md5($body, true))) {
-                // content-md5 header did not match md5 signature of body
-                $this->errorCode = self::ERR_MD5CHECKSUMWRONG;
-                return false;
-            }
-
-        }
-
-        if (!$requestDate = $this->request->getHeader('x-amz-date'))
-            $requestDate = $this->request->getHeader('Date');
-
-        if (!$this->validateRFC2616Date($requestDate))
-            return false;
-
-        $amzHeaders = $this->getAmzHeaders();
-
-        $signature = base64_encode(
-            $this->hmacsha1($secretKey,
-                $this->request->getMethod() . "\n" .
-                $contentMD5 . "\n" .
-                $this->request->getHeader('Content-type') . "\n" .
-                $requestDate . "\n" .
-                $amzHeaders .
-                $this->request->getUrl()
-            )
-        );
-
-        if ($this->signature != $signature) {
-
-            $this->errorCode = self::ERR_INVALIDSIGNATURE;
-            return false;
-
-        }
-
-        return true;
-
-    }
-
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    public function requireLogin() {
-
-        $this->response->addHeader('WWW-Authenticate', 'AWS');
-        $this->response->setStatus(401);
-
-    }
-
-    /**
-     * Makes sure the supplied value is a valid RFC2616 date.
-     *
-     * If we would just use strtotime to get a valid timestamp, we have no way of checking if a
-     * user just supplied the word 'now' for the date header.
-     *
-     * This function also makes sure the Date header is within 15 minutes of the operating
-     * system date, to prevent replay attacks.
-     *
-     * @param string $dateHeader
-     * @return bool
-     */
-    protected function validateRFC2616Date($dateHeader) {
-
-        $date = Util::parseHTTPDate($dateHeader);
-
-        // Unknown format
-        if (!$date) {
-            $this->errorCode = self::ERR_INVALIDDATEFORMAT;
-            return false;
-        }
-
-        $min = new \DateTime('-15 minutes');
-        $max = new \DateTime('+15 minutes');
-
-        // We allow 15 minutes around the current date/time
-        if ($date > $max || $date < $min) {
-            $this->errorCode = self::ERR_REQUESTTIMESKEWED;
-            return false;
-        }
-
-        return $date;
-
-    }
-
-    /**
-     * Returns a list of AMZ headers
-     *
-     * @return string
-     */
-    protected function getAmzHeaders() {
-
-        $amzHeaders = [];
-        $headers = $this->request->getHeaders();
-        foreach ($headers as $headerName => $headerValue) {
-            if (strpos(strtolower($headerName), 'x-amz-') === 0) {
-                $amzHeaders[strtolower($headerName)] = str_replace(["\r\n"], [' '], $headerValue[0]) . "\n";
-            }
-        }
-        ksort($amzHeaders);
-
-        $headerStr = '';
-        foreach ($amzHeaders as $h => $v) {
-            $headerStr .= $h . ':' . $v;
-        }
-
-        return $headerStr;
-
-    }
-
-    /**
-     * Generates an HMAC-SHA1 signature
-     *
-     * @param string $key
-     * @param string $message
-     * @return string
-     */
-    private function hmacsha1($key, $message) {
-
-        if (function_exists('hash_hmac')) {
-            return hash_hmac('sha1', $message, $key, true);
-        }
-
-        $blocksize = 64;
-        if (strlen($key) > $blocksize) {
-            $key = pack('H*', sha1($key));
-        }
-        $key = str_pad($key, $blocksize, chr(0x00));
-        $ipad = str_repeat(chr(0x36), $blocksize);
-        $opad = str_repeat(chr(0x5c), $blocksize);
-        $hmac = pack('H*', sha1(($key ^ $opad) . pack('H*', sha1(($key ^ $ipad) . $message))));
-        return $hmac;
-
-    }
+	/**
+	 * The signature supplied by the HTTP client
+	 *
+	 * @var string
+	 */
+	private $signature = null;
+
+	/**
+	 * The accesskey supplied by the HTTP client
+	 *
+	 * @var string
+	 */
+	private $accessKey = null;
+
+	/**
+	 * An error code, if any
+	 *
+	 * This value will be filled with one of the ERR_* constants
+	 *
+	 * @var int
+	 */
+	public $errorCode = 0;
+
+	const ERR_NOAWSHEADER = 1;
+	const ERR_MD5CHECKSUMWRONG = 2;
+	const ERR_INVALIDDATEFORMAT = 3;
+	const ERR_REQUESTTIMESKEWED = 4;
+	const ERR_INVALIDSIGNATURE = 5;
+
+	/**
+	 * Gathers all information from the headers
+	 *
+	 * This method needs to be called prior to anything else.
+	 *
+	 * @return bool
+	 */
+	public function init() {
+
+		$authHeader = $this->request->getHeader('Authorization');
+		$authHeader = explode(' ', $authHeader);
+
+		if ($authHeader[0] != 'AWS' || !isset($authHeader[1])) {
+			$this->errorCode = self::ERR_NOAWSHEADER;
+			 return false;
+		}
+
+		list($this->accessKey, $this->signature) = explode(':', $authHeader[1]);
+
+		return true;
+
+	}
+
+	/**
+	 * Returns the username for the request
+	 *
+	 * @return string
+	 */
+	public function getAccessKey() {
+
+		return $this->accessKey;
+
+	}
+
+	/**
+	 * Validates the signature based on the secretKey
+	 *
+	 * @param string $secretKey
+	 * @return bool
+	 */
+	public function validate($secretKey) {
+
+		$contentMD5 = $this->request->getHeader('Content-MD5');
+
+		if ($contentMD5) {
+			// We need to validate the integrity of the request
+			$body = $this->request->getBody();
+			$this->request->setBody($body);
+
+			if ($contentMD5 != base64_encode(md5($body, true))) {
+				// content-md5 header did not match md5 signature of body
+				$this->errorCode = self::ERR_MD5CHECKSUMWRONG;
+				return false;
+			}
+
+		}
+
+		if (!$requestDate = $this->request->getHeader('x-amz-date'))
+			$requestDate = $this->request->getHeader('Date');
+
+		if (!$this->validateRFC2616Date($requestDate))
+			return false;
+
+		$amzHeaders = $this->getAmzHeaders();
+
+		$signature = base64_encode(
+			$this->hmacsha1($secretKey,
+				$this->request->getMethod() . "\n" .
+				$contentMD5 . "\n" .
+				$this->request->getHeader('Content-type') . "\n" .
+				$requestDate . "\n" .
+				$amzHeaders .
+				$this->request->getUrl()
+			)
+		);
+
+		if ($this->signature != $signature) {
+
+			$this->errorCode = self::ERR_INVALIDSIGNATURE;
+			return false;
+
+		}
+
+		return true;
+
+	}
+
+
+	/**
+	 * Returns an HTTP 401 header, forcing login
+	 *
+	 * This should be called when username and password are incorrect, or not supplied at all
+	 *
+	 * @return void
+	 */
+	public function requireLogin() {
+
+		$this->response->addHeader('WWW-Authenticate', 'AWS');
+		$this->response->setStatus(401);
+
+	}
+
+	/**
+	 * Makes sure the supplied value is a valid RFC2616 date.
+	 *
+	 * If we would just use strtotime to get a valid timestamp, we have no way of checking if a
+	 * user just supplied the word 'now' for the date header.
+	 *
+	 * This function also makes sure the Date header is within 15 minutes of the operating
+	 * system date, to prevent replay attacks.
+	 *
+	 * @param string $dateHeader
+	 * @return bool
+	 */
+	protected function validateRFC2616Date($dateHeader) {
+
+		$date = Util::parseHTTPDate($dateHeader);
+
+		// Unknown format
+		if (!$date) {
+			$this->errorCode = self::ERR_INVALIDDATEFORMAT;
+			return false;
+		}
+
+		$min = new \DateTime('-15 minutes');
+		$max = new \DateTime('+15 minutes');
+
+		// We allow 15 minutes around the current date/time
+		if ($date > $max || $date < $min) {
+			$this->errorCode = self::ERR_REQUESTTIMESKEWED;
+			return false;
+		}
+
+		return $date;
+
+	}
+
+	/**
+	 * Returns a list of AMZ headers
+	 *
+	 * @return string
+	 */
+	protected function getAmzHeaders() {
+
+		$amzHeaders = [];
+		$headers = $this->request->getHeaders();
+		foreach ($headers as $headerName => $headerValue) {
+			if (strpos(strtolower($headerName), 'x-amz-') === 0) {
+				$amzHeaders[strtolower($headerName)] = str_replace(["\r\n"], [' '], $headerValue[0]) . "\n";
+			}
+		}
+		ksort($amzHeaders);
+
+		$headerStr = '';
+		foreach ($amzHeaders as $h => $v) {
+			$headerStr .= $h . ':' . $v;
+		}
+
+		return $headerStr;
+
+	}
+
+	/**
+	 * Generates an HMAC-SHA1 signature
+	 *
+	 * @param string $key
+	 * @param string $message
+	 * @return string
+	 */
+	private function hmacsha1($key, $message) {
+
+		if (function_exists('hash_hmac')) {
+			return hash_hmac('sha1', $message, $key, true);
+		}
+
+		$blocksize = 64;
+		if (strlen($key) > $blocksize) {
+			$key = pack('H*', sha1($key));
+		}
+		$key = str_pad($key, $blocksize, chr(0x00));
+		$ipad = str_repeat(chr(0x36), $blocksize);
+		$opad = str_repeat(chr(0x5c), $blocksize);
+		$hmac = pack('H*', sha1(($key ^ $opad) . pack('H*', sha1(($key ^ $ipad) . $message))));
+		return $hmac;
+
+	}
 
 }