chamilo / chamilo-lms

plugin/buycourses/src/Requests/Transport/cURL.php

Indentation +526 added lines, -526 removed lines

@@ -13,530 +13,530 @@
  * @subpackage Transport
  */
 class Requests_Transport_cURL implements Requests_Transport {
-	const CURL_7_10_5 = 0x070A05;
-	const CURL_7_16_2 = 0x071002;
-
-	/**
-	 * Raw HTTP data
-	 *
-	 * @var string
-	 */
-	public $headers = '';
-
-	/**
-	 * Raw body data
-	 *
-	 * @var string
-	 */
-	public $response_data = '';
-
-	/**
-	 * Information on the current request
-	 *
-	 * @var array cURL information array, see {@see https://secure.php.net/curl_getinfo}
-	 */
-	public $info;
-
-	/**
-	 * Version string
-	 *
-	 * @var long
-	 */
-	public $version;
-
-	/**
-	 * cURL handle
-	 *
-	 * @var resource
-	 */
-	protected $handle;
-
-	/**
-	 * Hook dispatcher instance
-	 *
-	 * @var Requests_Hooks
-	 */
-	protected $hooks;
-
-	/**
-	 * Have we finished the headers yet?
-	 *
-	 * @var boolean
-	 */
-	protected $done_headers = false;
-
-	/**
-	 * If streaming to a file, keep the file pointer
-	 *
-	 * @var resource
-	 */
-	protected $stream_handle;
-
-	/**
-	 * How many bytes are in the response body?
-	 *
-	 * @var int
-	 */
-	protected $response_bytes;
-
-	/**
-	 * What's the maximum number of bytes we should keep?
-	 *
-	 * @var int|bool Byte count, or false if no limit.
-	 */
-	protected $response_byte_limit;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		$curl = curl_version();
-		$this->version = $curl['version_number'];
-		$this->handle = curl_init();
-
-		curl_setopt($this->handle, CURLOPT_HEADER, false);
-		curl_setopt($this->handle, CURLOPT_RETURNTRANSFER, 1);
-		if ($this->version >= self::CURL_7_10_5) {
-			curl_setopt($this->handle, CURLOPT_ENCODING, '');
-		}
-		if (defined('CURLOPT_PROTOCOLS')) {
-			curl_setopt($this->handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
-		}
-		if (defined('CURLOPT_REDIR_PROTOCOLS')) {
-			curl_setopt($this->handle, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
-		}
-	}
-
-	/**
-	 * Destructor
-	 */
-	public function __destruct() {
-		if (is_resource($this->handle)) {
-			curl_close($this->handle);
-		}
-	}
-
-	/**
-	 * Perform a request
-	 *
-	 * @throws Requests_Exception On a cURL error (`curlerror`)
-	 *
-	 * @param string $url URL to request
-	 * @param array $headers Associative array of request headers
-	 * @param string|array $data Data to send either as the POST body, or as parameters in the URL for a GET/HEAD
-	 * @param array $options Request options, see {@see Requests::response()} for documentation
-	 * @return string Raw HTTP result
-	 */
-	public function request($url, $headers = array(), $data = array(), $options = array()) {
-		$this->hooks = $options['hooks'];
-
-		$this->setup_handle($url, $headers, $data, $options);
-
-		$options['hooks']->dispatch('curl.before_send', array(&$this->handle));
-
-		if ($options['filename'] !== false) {
-			$this->stream_handle = fopen($options['filename'], 'wb');
-		}
-
-		$this->response_data = '';
-		$this->response_bytes = 0;
-		$this->response_byte_limit = false;
-		if ($options['max_bytes'] !== false) {
-			$this->response_byte_limit = $options['max_bytes'];
-		}
-
-		if (isset($options['verify'])) {
-			if ($options['verify'] === false) {
-				curl_setopt($this->handle, CURLOPT_SSL_VERIFYHOST, 0);
-				curl_setopt($this->handle, CURLOPT_SSL_VERIFYPEER, 0);
-			}
-			elseif (is_string($options['verify'])) {
-				curl_setopt($this->handle, CURLOPT_CAINFO, $options['verify']);
-			}
-		}
-
-		if (isset($options['verifyname']) && $options['verifyname'] === false) {
-			curl_setopt($this->handle, CURLOPT_SSL_VERIFYHOST, 0);
-		}
-
-		curl_exec($this->handle);
-		$response = $this->response_data;
-
-		$options['hooks']->dispatch('curl.after_send', array());
-
-		if (curl_errno($this->handle) === 23 || curl_errno($this->handle) === 61) {
-			// Reset encoding and try again
-			curl_setopt($this->handle, CURLOPT_ENCODING, 'none');
-
-			$this->response_data = '';
-			$this->response_bytes = 0;
-			curl_exec($this->handle);
-			$response = $this->response_data;
-		}
-
-		$this->process_response($response, $options);
-
-		// Need to remove the $this reference from the curl handle.
-		// Otherwise Requests_Transport_cURL wont be garbage collected and the curl_close() will never be called.
-		curl_setopt($this->handle, CURLOPT_HEADERFUNCTION, null);
-		curl_setopt($this->handle, CURLOPT_WRITEFUNCTION, null);
-
-		return $this->headers;
-	}
-
-	/**
-	 * Send multiple requests simultaneously
-	 *
-	 * @param array $requests Request data
-	 * @param array $options Global options
-	 * @return array Array of Requests_Response objects (may contain Requests_Exception or string responses as well)
-	 */
-	public function request_multiple($requests, $options) {
-		// If you're not requesting, we can't get any responses ¯\_(ツ)_/¯
-		if (empty($requests)) {
-			return array();
-		}
-
-		$multihandle = curl_multi_init();
-		$subrequests = array();
-		$subhandles = array();
-
-		$class = get_class($this);
-		foreach ($requests as $id => $request) {
-			$subrequests[$id] = new $class();
-			$subhandles[$id] = $subrequests[$id]->get_subrequest_handle($request['url'], $request['headers'], $request['data'], $request['options']);
-			$request['options']['hooks']->dispatch('curl.before_multi_add', array(&$subhandles[$id]));
-			curl_multi_add_handle($multihandle, $subhandles[$id]);
-		}
-
-		$completed = 0;
-		$responses = array();
-
-		$request['options']['hooks']->dispatch('curl.before_multi_exec', array(&$multihandle));
-
-		do {
-			$active = false;
-
-			do {
-				$status = curl_multi_exec($multihandle, $active);
-			}
-			while ($status === CURLM_CALL_MULTI_PERFORM);
-
-			$to_process = array();
-
-			// Read the information as needed
-			while ($done = curl_multi_info_read($multihandle)) {
-				$key = array_search($done['handle'], $subhandles, true);
-				if (!isset($to_process[$key])) {
-					$to_process[$key] = $done;
-				}
-			}
-
-			// Parse the finished requests before we start getting the new ones
-			foreach ($to_process as $key => $done) {
-				$options = $requests[$key]['options'];
-				if (CURLE_OK !== $done['result']) {
-					//get error string for handle.
-					$reason = curl_error($done['handle']);
-					$exception = new Requests_Exception_Transport_cURL(
-									$reason,
-									Requests_Exception_Transport_cURL::EASY,
-									$done['handle'],
-									$done['result']
-								);
-					$responses[$key] = $exception;
-					$options['hooks']->dispatch('transport.internal.parse_error', array(&$responses[$key], $requests[$key]));
-				}
-				else {
-					$responses[$key] = $subrequests[$key]->process_response($subrequests[$key]->response_data, $options);
-
-					$options['hooks']->dispatch('transport.internal.parse_response', array(&$responses[$key], $requests[$key]));
-				}
-
-				curl_multi_remove_handle($multihandle, $done['handle']);
-				curl_close($done['handle']);
-
-				if (!is_string($responses[$key])) {
-					$options['hooks']->dispatch('multiple.request.complete', array(&$responses[$key], $key));
-				}
-				$completed++;
-			}
-		}
-		while ($active || $completed < count($subrequests));
-
-		$request['options']['hooks']->dispatch('curl.after_multi_exec', array(&$multihandle));
-
-		curl_multi_close($multihandle);
-
-		return $responses;
-	}
-
-	/**
-	 * Get the cURL handle for use in a multi-request
-	 *
-	 * @param string $url URL to request
-	 * @param array $headers Associative array of request headers
-	 * @param string|array $data Data to send either as the POST body, or as parameters in the URL for a GET/HEAD
-	 * @param array $options Request options, see {@see Requests::response()} for documentation
-	 * @return resource Subrequest's cURL handle
-	 */
-	public function &get_subrequest_handle($url, $headers, $data, $options) {
-		$this->setup_handle($url, $headers, $data, $options);
-
-		if ($options['filename'] !== false) {
-			$this->stream_handle = fopen($options['filename'], 'wb');
-		}
-
-		$this->response_data = '';
-		$this->response_bytes = 0;
-		$this->response_byte_limit = false;
-		if ($options['max_bytes'] !== false) {
-			$this->response_byte_limit = $options['max_bytes'];
-		}
-		$this->hooks = $options['hooks'];
-
-		return $this->handle;
-	}
-
-	/**
-	 * Setup the cURL handle for the given data
-	 *
-	 * @param string $url URL to request
-	 * @param array $headers Associative array of request headers
-	 * @param string|array $data Data to send either as the POST body, or as parameters in the URL for a GET/HEAD
-	 * @param array $options Request options, see {@see Requests::response()} for documentation
-	 */
-	protected function setup_handle($url, $headers, $data, $options) {
-		$options['hooks']->dispatch('curl.before_request', array(&$this->handle));
-
-		// Force closing the connection for old versions of cURL (<7.22).
-		if ( ! isset( $headers['Connection'] ) ) {
-			$headers['Connection'] = 'close';
-		}
-
-		$headers = Requests::flatten($headers);
-
-		if (!empty($data)) {
-			$data_format = $options['data_format'];
-
-			if ($data_format === 'query') {
-				$url = self::format_get($url, $data);
-				$data = '';
-			}
-			elseif (!is_string($data)) {
-				$data = http_build_query($data, null, '&');
-			}
-		}
-
-		switch ($options['type']) {
-			case Requests::POST:
-				curl_setopt($this->handle, CURLOPT_POST, true);
-				curl_setopt($this->handle, CURLOPT_POSTFIELDS, $data);
-				break;
-			case Requests::HEAD:
-				curl_setopt($this->handle, CURLOPT_CUSTOMREQUEST, $options['type']);
-				curl_setopt($this->handle, CURLOPT_NOBODY, true);
-				break;
-			case Requests::TRACE:
-				curl_setopt($this->handle, CURLOPT_CUSTOMREQUEST, $options['type']);
-				break;
-			case Requests::PATCH:
-			case Requests::PUT:
-			case Requests::DELETE:
-			case Requests::OPTIONS:
-			default:
-				curl_setopt($this->handle, CURLOPT_CUSTOMREQUEST, $options['type']);
-				if (!empty($data)) {
-					curl_setopt($this->handle, CURLOPT_POSTFIELDS, $data);
-				}
-		}
-
-		// cURL requires a minimum timeout of 1 second when using the system
-		// DNS resolver, as it uses `alarm()`, which is second resolution only.
-		// There's no way to detect which DNS resolver is being used from our
-		// end, so we need to round up regardless of the supplied timeout.
-		//
-		// https://github.com/curl/curl/blob/4f45240bc84a9aa648c8f7243be7b79e9f9323a5/lib/hostip.c#L606-L609
-		$timeout = max($options['timeout'], 1);
-
-		if (is_int($timeout) || $this->version < self::CURL_7_16_2) {
-			curl_setopt($this->handle, CURLOPT_TIMEOUT, ceil($timeout));
-		}
-		else {
-			curl_setopt($this->handle, CURLOPT_TIMEOUT_MS, round($timeout * 1000));
-		}
-
-		if (is_int($options['connect_timeout']) || $this->version < self::CURL_7_16_2) {
-			curl_setopt($this->handle, CURLOPT_CONNECTTIMEOUT, ceil($options['connect_timeout']));
-		}
-		else {
-			curl_setopt($this->handle, CURLOPT_CONNECTTIMEOUT_MS, round($options['connect_timeout'] * 1000));
-		}
-		curl_setopt($this->handle, CURLOPT_URL, $url);
-		curl_setopt($this->handle, CURLOPT_REFERER, $url);
-		curl_setopt($this->handle, CURLOPT_USERAGENT, $options['useragent']);
-		if (!empty($headers)) {
-			curl_setopt($this->handle, CURLOPT_HTTPHEADER, $headers);
-		}
-		if ($options['protocol_version'] === 1.1) {
-			curl_setopt($this->handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
-		}
-		else {
-			curl_setopt($this->handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
-		}
-
-		if (true === $options['blocking']) {
-			curl_setopt($this->handle, CURLOPT_HEADERFUNCTION, array(&$this, 'stream_headers'));
-			curl_setopt($this->handle, CURLOPT_WRITEFUNCTION, array(&$this, 'stream_body'));
-			curl_setopt($this->handle, CURLOPT_BUFFERSIZE, Requests::BUFFER_SIZE);
-		}
-	}
-
-	/**
-	 * Process a response
-	 *
-	 * @param string $response Response data from the body
-	 * @param array $options Request options
-	 * @return string HTTP response data including headers
-	 */
-	public function process_response($response, $options) {
-		if ($options['blocking'] === false) {
-			$fake_headers = '';
-			$options['hooks']->dispatch('curl.after_request', array(&$fake_headers));
-			return false;
-		}
-		if ($options['filename'] !== false) {
-			fclose($this->stream_handle);
-			$this->headers = trim($this->headers);
-		}
-		else {
-			$this->headers .= $response;
-		}
-
-		if (curl_errno($this->handle)) {
-			$error = sprintf(
-				'cURL error %s: %s',
-				curl_errno($this->handle),
-				curl_error($this->handle)
-			);
-			throw new Requests_Exception($error, 'curlerror', $this->handle);
-		}
-		$this->info = curl_getinfo($this->handle);
-
-		$options['hooks']->dispatch('curl.after_request', array(&$this->headers, &$this->info));
-		return $this->headers;
-	}
-
-	/**
-	 * Collect the headers as they are received
-	 *
-	 * @param resource $handle cURL resource
-	 * @param string $headers Header string
-	 * @return integer Length of provided header
-	 */
-	public function stream_headers($handle, $headers) {
-		// Why do we do this? cURL will send both the final response and any
-		// interim responses, such as a 100 Continue. We don't need that.
-		// (We may want to keep this somewhere just in case)
-		if ($this->done_headers) {
-			$this->headers = '';
-			$this->done_headers = false;
-		}
-		$this->headers .= $headers;
-
-		if ($headers === "\r\n") {
-			$this->done_headers = true;
-		}
-		return strlen($headers);
-	}
-
-	/**
-	 * Collect data as it's received
-	 *
-	 * @since 1.6.1
-	 *
-	 * @param resource $handle cURL resource
-	 * @param string $data Body data
-	 * @return integer Length of provided data
-	 */
-	public function stream_body($handle, $data) {
-		$this->hooks->dispatch('request.progress', array($data, $this->response_bytes, $this->response_byte_limit));
-		$data_length = strlen($data);
-
-		// Are we limiting the response size?
-		if ($this->response_byte_limit) {
-			if ($this->response_bytes === $this->response_byte_limit) {
-				// Already at maximum, move on
-				return $data_length;
-			}
-
-			if (($this->response_bytes + $data_length) > $this->response_byte_limit) {
-				// Limit the length
-				$limited_length = ($this->response_byte_limit - $this->response_bytes);
-				$data = substr($data, 0, $limited_length);
-			}
-		}
-
-		if ($this->stream_handle) {
-			fwrite($this->stream_handle, $data);
-		}
-		else {
-			$this->response_data .= $data;
-		}
-
-		$this->response_bytes += strlen($data);
-		return $data_length;
-	}
-
-	/**
-	 * Format a URL given GET data
-	 *
-	 * @param string $url
-	 * @param array|object $data Data to build query using, see {@see https://secure.php.net/http_build_query}
-	 * @return string URL with data
-	 */
-	protected static function format_get($url, $data) {
-		if (!empty($data)) {
-			$url_parts = parse_url($url);
-			if (empty($url_parts['query'])) {
-				$query = $url_parts['query'] = '';
-			}
-			else {
-				$query = $url_parts['query'];
-			}
-
-			$query .= '&' . http_build_query($data, null, '&');
-			$query = trim($query, '&');
-
-			if (empty($url_parts['query'])) {
-				$url .= '?' . $query;
-			}
-			else {
-				$url = str_replace($url_parts['query'], $query, $url);
-			}
-		}
-		return $url;
-	}
-
-	/**
-	 * Whether this transport is valid
-	 *
-	 * @codeCoverageIgnore
-	 * @return boolean True if the transport is valid, false otherwise.
-	 */
-	public static function test($capabilities = array()) {
-		if (!function_exists('curl_init') || !function_exists('curl_exec')) {
-			return false;
-		}
-
-		// If needed, check that our installed curl version supports SSL
-		if (isset($capabilities['ssl']) && $capabilities['ssl']) {
-			$curl_version = curl_version();
-			if (!(CURL_VERSION_SSL & $curl_version['features'])) {
-				return false;
-			}
-		}
-
-		return true;
-	}
+    const CURL_7_10_5 = 0x070A05;
+    const CURL_7_16_2 = 0x071002;
+
+    /**
+     * Raw HTTP data
+     *
+     * @var string
+     */
+    public $headers = '';
+
+    /**
+     * Raw body data
+     *
+     * @var string
+     */
+    public $response_data = '';
+
+    /**
+     * Information on the current request
+     *
+     * @var array cURL information array, see {@see https://secure.php.net/curl_getinfo}
+     */
+    public $info;
+
+    /**
+     * Version string
+     *
+     * @var long
+     */
+    public $version;
+
+    /**
+     * cURL handle
+     *
+     * @var resource
+     */
+    protected $handle;
+
+    /**
+     * Hook dispatcher instance
+     *
+     * @var Requests_Hooks
+     */
+    protected $hooks;
+
+    /**
+     * Have we finished the headers yet?
+     *
+     * @var boolean
+     */
+    protected $done_headers = false;
+
+    /**
+     * If streaming to a file, keep the file pointer
+     *
+     * @var resource
+     */
+    protected $stream_handle;
+
+    /**
+     * How many bytes are in the response body?
+     *
+     * @var int
+     */
+    protected $response_bytes;
+
+    /**
+     * What's the maximum number of bytes we should keep?
+     *
+     * @var int|bool Byte count, or false if no limit.
+     */
+    protected $response_byte_limit;
+
+    /**
+     * Constructor
+     */
+    public function __construct() {
+        $curl = curl_version();
+        $this->version = $curl['version_number'];
+        $this->handle = curl_init();
+
+        curl_setopt($this->handle, CURLOPT_HEADER, false);
+        curl_setopt($this->handle, CURLOPT_RETURNTRANSFER, 1);
+        if ($this->version >= self::CURL_7_10_5) {
+            curl_setopt($this->handle, CURLOPT_ENCODING, '');
+        }
+        if (defined('CURLOPT_PROTOCOLS')) {
+            curl_setopt($this->handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+        }
+        if (defined('CURLOPT_REDIR_PROTOCOLS')) {
+            curl_setopt($this->handle, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+        }
+    }
+
+    /**
+     * Destructor
+     */
+    public function __destruct() {
+        if (is_resource($this->handle)) {
+            curl_close($this->handle);
+        }
+    }
+
+    /**
+     * Perform a request
+     *
+     * @throws Requests_Exception On a cURL error (`curlerror`)
+     *
+     * @param string $url URL to request
+     * @param array $headers Associative array of request headers
+     * @param string|array $data Data to send either as the POST body, or as parameters in the URL for a GET/HEAD
+     * @param array $options Request options, see {@see Requests::response()} for documentation
+     * @return string Raw HTTP result
+     */
+    public function request($url, $headers = array(), $data = array(), $options = array()) {
+        $this->hooks = $options['hooks'];
+
+        $this->setup_handle($url, $headers, $data, $options);
+
+        $options['hooks']->dispatch('curl.before_send', array(&$this->handle));
+
+        if ($options['filename'] !== false) {
+            $this->stream_handle = fopen($options['filename'], 'wb');
+        }
+
+        $this->response_data = '';
+        $this->response_bytes = 0;
+        $this->response_byte_limit = false;
+        if ($options['max_bytes'] !== false) {
+            $this->response_byte_limit = $options['max_bytes'];
+        }
+
+        if (isset($options['verify'])) {
+            if ($options['verify'] === false) {
+                curl_setopt($this->handle, CURLOPT_SSL_VERIFYHOST, 0);
+                curl_setopt($this->handle, CURLOPT_SSL_VERIFYPEER, 0);
+            }
+            elseif (is_string($options['verify'])) {
+                curl_setopt($this->handle, CURLOPT_CAINFO, $options['verify']);
+            }
+        }
+
+        if (isset($options['verifyname']) && $options['verifyname'] === false) {
+            curl_setopt($this->handle, CURLOPT_SSL_VERIFYHOST, 0);
+        }
+
+        curl_exec($this->handle);
+        $response = $this->response_data;
+
+        $options['hooks']->dispatch('curl.after_send', array());
+
+        if (curl_errno($this->handle) === 23 || curl_errno($this->handle) === 61) {
+            // Reset encoding and try again
+            curl_setopt($this->handle, CURLOPT_ENCODING, 'none');
+
+            $this->response_data = '';
+            $this->response_bytes = 0;
+            curl_exec($this->handle);
+            $response = $this->response_data;
+        }
+
+        $this->process_response($response, $options);
+
+        // Need to remove the $this reference from the curl handle.
+        // Otherwise Requests_Transport_cURL wont be garbage collected and the curl_close() will never be called.
+        curl_setopt($this->handle, CURLOPT_HEADERFUNCTION, null);
+        curl_setopt($this->handle, CURLOPT_WRITEFUNCTION, null);
+
+        return $this->headers;
+    }
+
+    /**
+     * Send multiple requests simultaneously
+     *
+     * @param array $requests Request data
+     * @param array $options Global options
+     * @return array Array of Requests_Response objects (may contain Requests_Exception or string responses as well)
+     */
+    public function request_multiple($requests, $options) {
+        // If you're not requesting, we can't get any responses ¯\_(ツ)_/¯
+        if (empty($requests)) {
+            return array();
+        }
+
+        $multihandle = curl_multi_init();
+        $subrequests = array();
+        $subhandles = array();
+
+        $class = get_class($this);
+        foreach ($requests as $id => $request) {
+            $subrequests[$id] = new $class();
+            $subhandles[$id] = $subrequests[$id]->get_subrequest_handle($request['url'], $request['headers'], $request['data'], $request['options']);
+            $request['options']['hooks']->dispatch('curl.before_multi_add', array(&$subhandles[$id]));
+            curl_multi_add_handle($multihandle, $subhandles[$id]);
+        }
+
+        $completed = 0;
+        $responses = array();
+
+        $request['options']['hooks']->dispatch('curl.before_multi_exec', array(&$multihandle));
+
+        do {
+            $active = false;
+
+            do {
+                $status = curl_multi_exec($multihandle, $active);
+            }
+            while ($status === CURLM_CALL_MULTI_PERFORM);
+
+            $to_process = array();
+
+            // Read the information as needed
+            while ($done = curl_multi_info_read($multihandle)) {
+                $key = array_search($done['handle'], $subhandles, true);
+                if (!isset($to_process[$key])) {
+                    $to_process[$key] = $done;
+                }
+            }
+
+            // Parse the finished requests before we start getting the new ones
+            foreach ($to_process as $key => $done) {
+                $options = $requests[$key]['options'];
+                if (CURLE_OK !== $done['result']) {
+                    //get error string for handle.
+                    $reason = curl_error($done['handle']);
+                    $exception = new Requests_Exception_Transport_cURL(
+                                    $reason,
+                                    Requests_Exception_Transport_cURL::EASY,
+                                    $done['handle'],
+                                    $done['result']
+                                );
+                    $responses[$key] = $exception;
+                    $options['hooks']->dispatch('transport.internal.parse_error', array(&$responses[$key], $requests[$key]));
+                }
+                else {
+                    $responses[$key] = $subrequests[$key]->process_response($subrequests[$key]->response_data, $options);
+
+                    $options['hooks']->dispatch('transport.internal.parse_response', array(&$responses[$key], $requests[$key]));
+                }
+
+                curl_multi_remove_handle($multihandle, $done['handle']);
+                curl_close($done['handle']);
+
+                if (!is_string($responses[$key])) {
+                    $options['hooks']->dispatch('multiple.request.complete', array(&$responses[$key], $key));
+                }
+                $completed++;
+            }
+        }
+        while ($active || $completed < count($subrequests));
+
+        $request['options']['hooks']->dispatch('curl.after_multi_exec', array(&$multihandle));
+
+        curl_multi_close($multihandle);
+
+        return $responses;
+    }
+
+    /**
+     * Get the cURL handle for use in a multi-request
+     *
+     * @param string $url URL to request
+     * @param array $headers Associative array of request headers
+     * @param string|array $data Data to send either as the POST body, or as parameters in the URL for a GET/HEAD
+     * @param array $options Request options, see {@see Requests::response()} for documentation
+     * @return resource Subrequest's cURL handle
+     */
+    public function &get_subrequest_handle($url, $headers, $data, $options) {
+        $this->setup_handle($url, $headers, $data, $options);
+
+        if ($options['filename'] !== false) {
+            $this->stream_handle = fopen($options['filename'], 'wb');
+        }
+
+        $this->response_data = '';
+        $this->response_bytes = 0;
+        $this->response_byte_limit = false;
+        if ($options['max_bytes'] !== false) {
+            $this->response_byte_limit = $options['max_bytes'];
+        }
+        $this->hooks = $options['hooks'];
+
+        return $this->handle;
+    }
+
+    /**
+     * Setup the cURL handle for the given data
+     *
+     * @param string $url URL to request
+     * @param array $headers Associative array of request headers
+     * @param string|array $data Data to send either as the POST body, or as parameters in the URL for a GET/HEAD
+     * @param array $options Request options, see {@see Requests::response()} for documentation
+     */
+    protected function setup_handle($url, $headers, $data, $options) {
+        $options['hooks']->dispatch('curl.before_request', array(&$this->handle));
+
+        // Force closing the connection for old versions of cURL (<7.22).
+        if ( ! isset( $headers['Connection'] ) ) {
+            $headers['Connection'] = 'close';
+        }
+
+        $headers = Requests::flatten($headers);
+
+        if (!empty($data)) {
+            $data_format = $options['data_format'];
+
+            if ($data_format === 'query') {
+                $url = self::format_get($url, $data);
+                $data = '';
+            }
+            elseif (!is_string($data)) {
+                $data = http_build_query($data, null, '&');
+            }
+        }
+
+        switch ($options['type']) {
+            case Requests::POST:
+                curl_setopt($this->handle, CURLOPT_POST, true);
+                curl_setopt($this->handle, CURLOPT_POSTFIELDS, $data);
+                break;
+            case Requests::HEAD:
+                curl_setopt($this->handle, CURLOPT_CUSTOMREQUEST, $options['type']);
+                curl_setopt($this->handle, CURLOPT_NOBODY, true);
+                break;
+            case Requests::TRACE:
+                curl_setopt($this->handle, CURLOPT_CUSTOMREQUEST, $options['type']);
+                break;
+            case Requests::PATCH:
+            case Requests::PUT:
+            case Requests::DELETE:
+            case Requests::OPTIONS:
+            default:
+                curl_setopt($this->handle, CURLOPT_CUSTOMREQUEST, $options['type']);
+                if (!empty($data)) {
+                    curl_setopt($this->handle, CURLOPT_POSTFIELDS, $data);
+                }
+        }
+
+        // cURL requires a minimum timeout of 1 second when using the system
+        // DNS resolver, as it uses `alarm()`, which is second resolution only.
+        // There's no way to detect which DNS resolver is being used from our
+        // end, so we need to round up regardless of the supplied timeout.
+        //
+        // https://github.com/curl/curl/blob/4f45240bc84a9aa648c8f7243be7b79e9f9323a5/lib/hostip.c#L606-L609
+        $timeout = max($options['timeout'], 1);
+
+        if (is_int($timeout) || $this->version < self::CURL_7_16_2) {
+            curl_setopt($this->handle, CURLOPT_TIMEOUT, ceil($timeout));
+        }
+        else {
+            curl_setopt($this->handle, CURLOPT_TIMEOUT_MS, round($timeout * 1000));
+        }
+
+        if (is_int($options['connect_timeout']) || $this->version < self::CURL_7_16_2) {
+            curl_setopt($this->handle, CURLOPT_CONNECTTIMEOUT, ceil($options['connect_timeout']));
+        }
+        else {
+            curl_setopt($this->handle, CURLOPT_CONNECTTIMEOUT_MS, round($options['connect_timeout'] * 1000));
+        }
+        curl_setopt($this->handle, CURLOPT_URL, $url);
+        curl_setopt($this->handle, CURLOPT_REFERER, $url);
+        curl_setopt($this->handle, CURLOPT_USERAGENT, $options['useragent']);
+        if (!empty($headers)) {
+            curl_setopt($this->handle, CURLOPT_HTTPHEADER, $headers);
+        }
+        if ($options['protocol_version'] === 1.1) {
+            curl_setopt($this->handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
+        }
+        else {
+            curl_setopt($this->handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+        }
+
+        if (true === $options['blocking']) {
+            curl_setopt($this->handle, CURLOPT_HEADERFUNCTION, array(&$this, 'stream_headers'));
+            curl_setopt($this->handle, CURLOPT_WRITEFUNCTION, array(&$this, 'stream_body'));
+            curl_setopt($this->handle, CURLOPT_BUFFERSIZE, Requests::BUFFER_SIZE);
+        }
+    }
+
+    /**
+     * Process a response
+     *
+     * @param string $response Response data from the body
+     * @param array $options Request options
+     * @return string HTTP response data including headers
+     */
+    public function process_response($response, $options) {
+        if ($options['blocking'] === false) {
+            $fake_headers = '';
+            $options['hooks']->dispatch('curl.after_request', array(&$fake_headers));
+            return false;
+        }
+        if ($options['filename'] !== false) {
+            fclose($this->stream_handle);
+            $this->headers = trim($this->headers);
+        }
+        else {
+            $this->headers .= $response;
+        }
+
+        if (curl_errno($this->handle)) {
+            $error = sprintf(
+                'cURL error %s: %s',
+                curl_errno($this->handle),
+                curl_error($this->handle)
+            );
+            throw new Requests_Exception($error, 'curlerror', $this->handle);
+        }
+        $this->info = curl_getinfo($this->handle);
+
+        $options['hooks']->dispatch('curl.after_request', array(&$this->headers, &$this->info));
+        return $this->headers;
+    }
+
+    /**
+     * Collect the headers as they are received
+     *
+     * @param resource $handle cURL resource
+     * @param string $headers Header string
+     * @return integer Length of provided header
+     */
+    public function stream_headers($handle, $headers) {
+        // Why do we do this? cURL will send both the final response and any
+        // interim responses, such as a 100 Continue. We don't need that.
+        // (We may want to keep this somewhere just in case)
+        if ($this->done_headers) {
+            $this->headers = '';
+            $this->done_headers = false;
+        }
+        $this->headers .= $headers;
+
+        if ($headers === "\r\n") {
+            $this->done_headers = true;
+        }
+        return strlen($headers);
+    }
+
+    /**
+     * Collect data as it's received
+     *
+     * @since 1.6.1
+     *
+     * @param resource $handle cURL resource
+     * @param string $data Body data
+     * @return integer Length of provided data
+     */
+    public function stream_body($handle, $data) {
+        $this->hooks->dispatch('request.progress', array($data, $this->response_bytes, $this->response_byte_limit));
+        $data_length = strlen($data);
+
+        // Are we limiting the response size?
+        if ($this->response_byte_limit) {
+            if ($this->response_bytes === $this->response_byte_limit) {
+                // Already at maximum, move on
+                return $data_length;
+            }
+
+            if (($this->response_bytes + $data_length) > $this->response_byte_limit) {
+                // Limit the length
+                $limited_length = ($this->response_byte_limit - $this->response_bytes);
+                $data = substr($data, 0, $limited_length);
+            }
+        }
+
+        if ($this->stream_handle) {
+            fwrite($this->stream_handle, $data);
+        }
+        else {
+            $this->response_data .= $data;
+        }
+
+        $this->response_bytes += strlen($data);
+        return $data_length;
+    }
+
+    /**
+     * Format a URL given GET data
+     *
+     * @param string $url
+     * @param array|object $data Data to build query using, see {@see https://secure.php.net/http_build_query}
+     * @return string URL with data
+     */
+    protected static function format_get($url, $data) {
+        if (!empty($data)) {
+            $url_parts = parse_url($url);
+            if (empty($url_parts['query'])) {
+                $query = $url_parts['query'] = '';
+            }
+            else {
+                $query = $url_parts['query'];
+            }
+
+            $query .= '&' . http_build_query($data, null, '&');
+            $query = trim($query, '&');
+
+            if (empty($url_parts['query'])) {
+                $url .= '?' . $query;
+            }
+            else {
+                $url = str_replace($url_parts['query'], $query, $url);
+            }
+        }
+        return $url;
+    }
+
+    /**
+     * Whether this transport is valid
+     *
+     * @codeCoverageIgnore
+     * @return boolean True if the transport is valid, false otherwise.
+     */
+    public static function test($capabilities = array()) {
+        if (!function_exists('curl_init') || !function_exists('curl_exec')) {
+            return false;
+        }
+
+        // If needed, check that our installed curl version supports SSL
+        if (isset($capabilities['ssl']) && $capabilities['ssl']) {
+            $curl_version = curl_version();
+            if (!(CURL_VERSION_SSL & $curl_version['features'])) {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }

plugin/buycourses/src/Requests/Transport/fsockopen.php

Indentation +428 added lines, -428 removed lines

@@ -13,432 +13,432 @@
  * @subpackage Transport
  */
 class Requests_Transport_fsockopen implements Requests_Transport {
-	/**
-	 * Second to microsecond conversion
-	 *
-	 * @var integer
-	 */
-	const SECOND_IN_MICROSECONDS = 1000000;
-
-	/**
-	 * Raw HTTP data
-	 *
-	 * @var string
-	 */
-	public $headers = '';
-
-	/**
-	 * Stream metadata
-	 *
-	 * @var array Associative array of properties, see {@see https://secure.php.net/stream_get_meta_data}
-	 */
-	public $info;
-
-	/**
-	 * What's the maximum number of bytes we should keep?
-	 *
-	 * @var int|bool Byte count, or false if no limit.
-	 */
-	protected $max_bytes = false;
-
-	protected $connect_error = '';
-
-	/**
-	 * Perform a request
-	 *
-	 * @throws Requests_Exception On failure to connect to socket (`fsockopenerror`)
-	 * @throws Requests_Exception On socket timeout (`timeout`)
-	 *
-	 * @param string $url URL to request
-	 * @param array $headers Associative array of request headers
-	 * @param string|array $data Data to send either as the POST body, or as parameters in the URL for a GET/HEAD
-	 * @param array $options Request options, see {@see Requests::response()} for documentation
-	 * @return string Raw HTTP result
-	 */
-	public function request($url, $headers = array(), $data = array(), $options = array()) {
-		$options['hooks']->dispatch('fsockopen.before_request');
-
-		$url_parts = parse_url($url);
-		if (empty($url_parts)) {
-			throw new Requests_Exception('Invalid URL.', 'invalidurl', $url);
-		}
-		$host = $url_parts['host'];
-		$context = stream_context_create();
-		$verifyname = false;
-		$case_insensitive_headers = new Requests_Utility_CaseInsensitiveDictionary($headers);
-
-		// HTTPS support
-		if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) === 'https') {
-			$remote_socket = 'ssl://' . $host;
-			if (!isset($url_parts['port'])) {
-				$url_parts['port'] = 443;
-			}
-
-			$context_options = array(
-				'verify_peer' => true,
-				// 'CN_match' => $host,
-				'capture_peer_cert' => true
-			);
-			$verifyname = true;
-
-			// SNI, if enabled (OpenSSL >=0.9.8j)
-			if (defined('OPENSSL_TLSEXT_SERVER_NAME') && OPENSSL_TLSEXT_SERVER_NAME) {
-				$context_options['SNI_enabled'] = true;
-				if (isset($options['verifyname']) && $options['verifyname'] === false) {
-					$context_options['SNI_enabled'] = false;
-				}
-			}
-
-			if (isset($options['verify'])) {
-				if ($options['verify'] === false) {
-					$context_options['verify_peer'] = false;
-				}
-				elseif (is_string($options['verify'])) {
-					$context_options['cafile'] = $options['verify'];
-				}
-			}
-
-			if (isset($options['verifyname']) && $options['verifyname'] === false) {
-				$context_options['verify_peer_name'] = false;
-				$verifyname = false;
-			}
-
-			stream_context_set_option($context, array('ssl' => $context_options));
-		}
-		else {
-			$remote_socket = 'tcp://' . $host;
-		}
-
-		$this->max_bytes = $options['max_bytes'];
-
-		if (!isset($url_parts['port'])) {
-			$url_parts['port'] = 80;
-		}
-		$remote_socket .= ':' . $url_parts['port'];
-
-		set_error_handler(array($this, 'connect_error_handler'), E_WARNING | E_NOTICE);
-
-		$options['hooks']->dispatch('fsockopen.remote_socket', array(&$remote_socket));
-
-		$socket = stream_socket_client($remote_socket, $errno, $errstr, ceil($options['connect_timeout']), STREAM_CLIENT_CONNECT, $context);
-
-		restore_error_handler();
-
-		if ($verifyname && !$this->verify_certificate_from_context($host, $context)) {
-			throw new Requests_Exception('SSL certificate did not match the requested domain name', 'ssl.no_match');
-		}
-
-		if (!$socket) {
-			if ($errno === 0) {
-				// Connection issue
-				throw new Requests_Exception(rtrim($this->connect_error), 'fsockopen.connect_error');
-			}
-
-			throw new Requests_Exception($errstr, 'fsockopenerror', null, $errno);
-		}
-
-		$data_format = $options['data_format'];
-
-		if ($data_format === 'query') {
-			$path = self::format_get($url_parts, $data);
-			$data = '';
-		}
-		else {
-			$path = self::format_get($url_parts, array());
-		}
-
-		$options['hooks']->dispatch('fsockopen.remote_host_path', array(&$path, $url));
-
-		$request_body = '';
-		$out = sprintf("%s %s HTTP/%.1f\r\n", $options['type'], $path, $options['protocol_version']);
-
-		if ($options['type'] !== Requests::TRACE) {
-			if (is_array($data)) {
-				$request_body = http_build_query($data, null, '&');
-			}
-			else {
-				$request_body = $data;
-			}
-
-			if (!empty($data)) {
-				if (!isset($case_insensitive_headers['Content-Length'])) {
-					$headers['Content-Length'] = strlen($request_body);
-				}
-
-				if (!isset($case_insensitive_headers['Content-Type'])) {
-					$headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=UTF-8';
-				}
-			}
-		}
-
-		if (!isset($case_insensitive_headers['Host'])) {
-			$out .= sprintf('Host: %s', $url_parts['host']);
-
-			if (( 'http' === strtolower($url_parts['scheme']) && $url_parts['port'] !== 80 ) || ( 'https' === strtolower($url_parts['scheme']) && $url_parts['port'] !== 443 )) {
-				$out .= ':' . $url_parts['port'];
-			}
-			$out .= "\r\n";
-		}
-
-		if (!isset($case_insensitive_headers['User-Agent'])) {
-			$out .= sprintf("User-Agent: %s\r\n", $options['useragent']);
-		}
-
-		$accept_encoding = $this->accept_encoding();
-		if (!isset($case_insensitive_headers['Accept-Encoding']) && !empty($accept_encoding)) {
-			$out .= sprintf("Accept-Encoding: %s\r\n", $accept_encoding);
-		}
-
-		$headers = Requests::flatten($headers);
-
-		if (!empty($headers)) {
-			$out .= implode($headers, "\r\n") . "\r\n";
-		}
-
-		$options['hooks']->dispatch('fsockopen.after_headers', array(&$out));
-
-		if (substr($out, -2) !== "\r\n") {
-			$out .= "\r\n";
-		}
-
-		if (!isset($case_insensitive_headers['Connection'])) {
-			$out .= "Connection: Close\r\n";
-		}
-
-		$out .= "\r\n" . $request_body;
-
-		$options['hooks']->dispatch('fsockopen.before_send', array(&$out));
-
-		fwrite($socket, $out);
-		$options['hooks']->dispatch('fsockopen.after_send', array($out));
-
-		if (!$options['blocking']) {
-			fclose($socket);
-			$fake_headers = '';
-			$options['hooks']->dispatch('fsockopen.after_request', array(&$fake_headers));
-			return '';
-		}
-
-		$timeout_sec = (int) floor($options['timeout']);
-		if ($timeout_sec == $options['timeout']) {
-			$timeout_msec = 0;
-		}
-		else {
-			$timeout_msec = self::SECOND_IN_MICROSECONDS * $options['timeout'] % self::SECOND_IN_MICROSECONDS;
-		}
-		stream_set_timeout($socket, $timeout_sec, $timeout_msec);
-
-		$response = $body = $headers = '';
-		$this->info = stream_get_meta_data($socket);
-		$size = 0;
-		$doingbody = false;
-		$download = false;
-		if ($options['filename']) {
-			$download = fopen($options['filename'], 'wb');
-		}
-
-		while (!feof($socket)) {
-			$this->info = stream_get_meta_data($socket);
-			if ($this->info['timed_out']) {
-				throw new Requests_Exception('fsocket timed out', 'timeout');
-			}
-
-			$block = fread($socket, Requests::BUFFER_SIZE);
-			if (!$doingbody) {
-				$response .= $block;
-				if (strpos($response, "\r\n\r\n")) {
-					list($headers, $block) = explode("\r\n\r\n", $response, 2);
-					$doingbody = true;
-				}
-			}
-
-			// Are we in body mode now?
-			if ($doingbody) {
-				$options['hooks']->dispatch('request.progress', array($block, $size, $this->max_bytes));
-				$data_length = strlen($block);
-				if ($this->max_bytes) {
-					// Have we already hit a limit?
-					if ($size === $this->max_bytes) {
-						continue;
-					}
-					if (($size + $data_length) > $this->max_bytes) {
-						// Limit the length
-						$limited_length = ($this->max_bytes - $size);
-						$block = substr($block, 0, $limited_length);
-					}
-				}
-
-				$size += strlen($block);
-				if ($download) {
-					fwrite($download, $block);
-				}
-				else {
-					$body .= $block;
-				}
-			}
-		}
-		$this->headers = $headers;
-
-		if ($download) {
-			fclose($download);
-		}
-		else {
-			$this->headers .= "\r\n\r\n" . $body;
-		}
-		fclose($socket);
-
-		$options['hooks']->dispatch('fsockopen.after_request', array(&$this->headers, &$this->info));
-		return $this->headers;
-	}
-
-	/**
-	 * Send multiple requests simultaneously
-	 *
-	 * @param array $requests Request data (array of 'url', 'headers', 'data', 'options') as per {@see Requests_Transport::request}
-	 * @param array $options Global options, see {@see Requests::response()} for documentation
-	 * @return array Array of Requests_Response objects (may contain Requests_Exception or string responses as well)
-	 */
-	public function request_multiple($requests, $options) {
-		$responses = array();
-		$class = get_class($this);
-		foreach ($requests as $id => $request) {
-			try {
-				$handler = new $class();
-				$responses[$id] = $handler->request($request['url'], $request['headers'], $request['data'], $request['options']);
-
-				$request['options']['hooks']->dispatch('transport.internal.parse_response', array(&$responses[$id], $request));
-			}
-			catch (Requests_Exception $e) {
-				$responses[$id] = $e;
-			}
-
-			if (!is_string($responses[$id])) {
-				$request['options']['hooks']->dispatch('multiple.request.complete', array(&$responses[$id], $id));
-			}
-		}
-
-		return $responses;
-	}
-
-	/**
-	 * Retrieve the encodings we can accept
-	 *
-	 * @return string Accept-Encoding header value
-	 */
-	protected static function accept_encoding() {
-		$type = array();
-		if (function_exists('gzinflate')) {
-			$type[] = 'deflate;q=1.0';
-		}
-
-		if (function_exists('gzuncompress')) {
-			$type[] = 'compress;q=0.5';
-		}
-
-		$type[] = 'gzip;q=0.5';
-
-		return implode(', ', $type);
-	}
-
-	/**
-	 * Format a URL given GET data
-	 *
-	 * @param array $url_parts
-	 * @param array|object $data Data to build query using, see {@see https://secure.php.net/http_build_query}
-	 * @return string URL with data
-	 */
-	protected static function format_get($url_parts, $data) {
-		if (!empty($data)) {
-			if (empty($url_parts['query'])) {
-				$url_parts['query'] = '';
-			}
-
-			$url_parts['query'] .= '&' . http_build_query($data, null, '&');
-			$url_parts['query'] = trim($url_parts['query'], '&');
-		}
-		if (isset($url_parts['path'])) {
-			if (isset($url_parts['query'])) {
-				$get = $url_parts['path'] . '?' . $url_parts['query'];
-			}
-			else {
-				$get = $url_parts['path'];
-			}
-		}
-		else {
-			$get = '/';
-		}
-		return $get;
-	}
-
-	/**
-	 * Error handler for stream_socket_client()
-	 *
-	 * @param int $errno Error number (e.g. E_WARNING)
-	 * @param string $errstr Error message
-	 */
-	public function connect_error_handler($errno, $errstr) {
-		// Double-check we can handle it
-		if (($errno & E_WARNING) === 0 && ($errno & E_NOTICE) === 0) {
-			// Return false to indicate the default error handler should engage
-			return false;
-		}
-
-		$this->connect_error .= $errstr . "\n";
-		return true;
-	}
-
-	/**
-	 * Verify the certificate against common name and subject alternative names
-	 *
-	 * Unfortunately, PHP doesn't check the certificate against the alternative
-	 * names, leading things like 'https://www.github.com/' to be invalid.
-	 * Instead
-	 *
-	 * @see https://tools.ietf.org/html/rfc2818#section-3.1 RFC2818, Section 3.1
-	 *
-	 * @throws Requests_Exception On failure to connect via TLS (`fsockopen.ssl.connect_error`)
-	 * @throws Requests_Exception On not obtaining a match for the host (`fsockopen.ssl.no_match`)
-	 * @param string $host Host name to verify against
-	 * @param resource $context Stream context
-	 * @return bool
-	 */
-	public function verify_certificate_from_context($host, $context) {
-		$meta = stream_context_get_options($context);
-
-		// If we don't have SSL options, then we couldn't make the connection at
-		// all
-		if (empty($meta) || empty($meta['ssl']) || empty($meta['ssl']['peer_certificate'])) {
-			throw new Requests_Exception(rtrim($this->connect_error), 'ssl.connect_error');
-		}
-
-		$cert = openssl_x509_parse($meta['ssl']['peer_certificate']);
-
-		return Requests_SSL::verify_certificate($host, $cert);
-	}
-
-	/**
-	 * Whether this transport is valid
-	 *
-	 * @codeCoverageIgnore
-	 * @return boolean True if the transport is valid, false otherwise.
-	 */
-	public static function test($capabilities = array()) {
-		if (!function_exists('fsockopen')) {
-			return false;
-		}
-
-		// If needed, check that streams support SSL
-		if (isset($capabilities['ssl']) && $capabilities['ssl']) {
-			if (!extension_loaded('openssl') || !function_exists('openssl_x509_parse')) {
-				return false;
-			}
-
-			// Currently broken, thanks to https://github.com/facebook/hhvm/issues/2156
-			if (defined('HHVM_VERSION')) {
-				return false;
-			}
-		}
-
-		return true;
-	}
+    /**
+     * Second to microsecond conversion
+     *
+     * @var integer
+     */
+    const SECOND_IN_MICROSECONDS = 1000000;
+
+    /**
+     * Raw HTTP data
+     *
+     * @var string
+     */
+    public $headers = '';
+
+    /**
+     * Stream metadata
+     *
+     * @var array Associative array of properties, see {@see https://secure.php.net/stream_get_meta_data}
+     */
+    public $info;
+
+    /**
+     * What's the maximum number of bytes we should keep?
+     *
+     * @var int|bool Byte count, or false if no limit.
+     */
+    protected $max_bytes = false;
+
+    protected $connect_error = '';
+
+    /**
+     * Perform a request
+     *
+     * @throws Requests_Exception On failure to connect to socket (`fsockopenerror`)
+     * @throws Requests_Exception On socket timeout (`timeout`)
+     *
+     * @param string $url URL to request
+     * @param array $headers Associative array of request headers
+     * @param string|array $data Data to send either as the POST body, or as parameters in the URL for a GET/HEAD
+     * @param array $options Request options, see {@see Requests::response()} for documentation
+     * @return string Raw HTTP result
+     */
+    public function request($url, $headers = array(), $data = array(), $options = array()) {
+        $options['hooks']->dispatch('fsockopen.before_request');
+
+        $url_parts = parse_url($url);
+        if (empty($url_parts)) {
+            throw new Requests_Exception('Invalid URL.', 'invalidurl', $url);
+        }
+        $host = $url_parts['host'];
+        $context = stream_context_create();
+        $verifyname = false;
+        $case_insensitive_headers = new Requests_Utility_CaseInsensitiveDictionary($headers);
+
+        // HTTPS support
+        if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) === 'https') {
+            $remote_socket = 'ssl://' . $host;
+            if (!isset($url_parts['port'])) {
+                $url_parts['port'] = 443;
+            }
+
+            $context_options = array(
+                'verify_peer' => true,
+                // 'CN_match' => $host,
+                'capture_peer_cert' => true
+            );
+            $verifyname = true;
+
+            // SNI, if enabled (OpenSSL >=0.9.8j)
+            if (defined('OPENSSL_TLSEXT_SERVER_NAME') && OPENSSL_TLSEXT_SERVER_NAME) {
+                $context_options['SNI_enabled'] = true;
+                if (isset($options['verifyname']) && $options['verifyname'] === false) {
+                    $context_options['SNI_enabled'] = false;
+                }
+            }
+
+            if (isset($options['verify'])) {
+                if ($options['verify'] === false) {
+                    $context_options['verify_peer'] = false;
+                }
+                elseif (is_string($options['verify'])) {
+                    $context_options['cafile'] = $options['verify'];
+                }
+            }
+
+            if (isset($options['verifyname']) && $options['verifyname'] === false) {
+                $context_options['verify_peer_name'] = false;
+                $verifyname = false;
+            }
+
+            stream_context_set_option($context, array('ssl' => $context_options));
+        }
+        else {
+            $remote_socket = 'tcp://' . $host;
+        }
+
+        $this->max_bytes = $options['max_bytes'];
+
+        if (!isset($url_parts['port'])) {
+            $url_parts['port'] = 80;
+        }
+        $remote_socket .= ':' . $url_parts['port'];
+
+        set_error_handler(array($this, 'connect_error_handler'), E_WARNING | E_NOTICE);
+
+        $options['hooks']->dispatch('fsockopen.remote_socket', array(&$remote_socket));
+
+        $socket = stream_socket_client($remote_socket, $errno, $errstr, ceil($options['connect_timeout']), STREAM_CLIENT_CONNECT, $context);
+
+        restore_error_handler();
+
+        if ($verifyname && !$this->verify_certificate_from_context($host, $context)) {
+            throw new Requests_Exception('SSL certificate did not match the requested domain name', 'ssl.no_match');
+        }
+
+        if (!$socket) {
+            if ($errno === 0) {
+                // Connection issue
+                throw new Requests_Exception(rtrim($this->connect_error), 'fsockopen.connect_error');
+            }
+
+            throw new Requests_Exception($errstr, 'fsockopenerror', null, $errno);
+        }
+
+        $data_format = $options['data_format'];
+
+        if ($data_format === 'query') {
+            $path = self::format_get($url_parts, $data);
+            $data = '';
+        }
+        else {
+            $path = self::format_get($url_parts, array());
+        }
+
+        $options['hooks']->dispatch('fsockopen.remote_host_path', array(&$path, $url));
+
+        $request_body = '';
+        $out = sprintf("%s %s HTTP/%.1f\r\n", $options['type'], $path, $options['protocol_version']);
+
+        if ($options['type'] !== Requests::TRACE) {
+            if (is_array($data)) {
+                $request_body = http_build_query($data, null, '&');
+            }
+            else {
+                $request_body = $data;
+            }
+
+            if (!empty($data)) {
+                if (!isset($case_insensitive_headers['Content-Length'])) {
+                    $headers['Content-Length'] = strlen($request_body);
+                }
+
+                if (!isset($case_insensitive_headers['Content-Type'])) {
+                    $headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=UTF-8';
+                }
+            }
+        }
+
+        if (!isset($case_insensitive_headers['Host'])) {
+            $out .= sprintf('Host: %s', $url_parts['host']);
+
+            if (( 'http' === strtolower($url_parts['scheme']) && $url_parts['port'] !== 80 ) || ( 'https' === strtolower($url_parts['scheme']) && $url_parts['port'] !== 443 )) {
+                $out .= ':' . $url_parts['port'];
+            }
+            $out .= "\r\n";
+        }
+
+        if (!isset($case_insensitive_headers['User-Agent'])) {
+            $out .= sprintf("User-Agent: %s\r\n", $options['useragent']);
+        }
+
+        $accept_encoding = $this->accept_encoding();
+        if (!isset($case_insensitive_headers['Accept-Encoding']) && !empty($accept_encoding)) {
+            $out .= sprintf("Accept-Encoding: %s\r\n", $accept_encoding);
+        }
+
+        $headers = Requests::flatten($headers);
+
+        if (!empty($headers)) {
+            $out .= implode($headers, "\r\n") . "\r\n";
+        }
+
+        $options['hooks']->dispatch('fsockopen.after_headers', array(&$out));
+
+        if (substr($out, -2) !== "\r\n") {
+            $out .= "\r\n";
+        }
+
+        if (!isset($case_insensitive_headers['Connection'])) {
+            $out .= "Connection: Close\r\n";
+        }
+
+        $out .= "\r\n" . $request_body;
+
+        $options['hooks']->dispatch('fsockopen.before_send', array(&$out));
+
+        fwrite($socket, $out);
+        $options['hooks']->dispatch('fsockopen.after_send', array($out));
+
+        if (!$options['blocking']) {
+            fclose($socket);
+            $fake_headers = '';
+            $options['hooks']->dispatch('fsockopen.after_request', array(&$fake_headers));
+            return '';
+        }
+
+        $timeout_sec = (int) floor($options['timeout']);
+        if ($timeout_sec == $options['timeout']) {
+            $timeout_msec = 0;
+        }
+        else {
+            $timeout_msec = self::SECOND_IN_MICROSECONDS * $options['timeout'] % self::SECOND_IN_MICROSECONDS;
+        }
+        stream_set_timeout($socket, $timeout_sec, $timeout_msec);
+
+        $response = $body = $headers = '';
+        $this->info = stream_get_meta_data($socket);
+        $size = 0;
+        $doingbody = false;
+        $download = false;
+        if ($options['filename']) {
+            $download = fopen($options['filename'], 'wb');
+        }
+
+        while (!feof($socket)) {
+            $this->info = stream_get_meta_data($socket);
+            if ($this->info['timed_out']) {
+                throw new Requests_Exception('fsocket timed out', 'timeout');
+            }
+
+            $block = fread($socket, Requests::BUFFER_SIZE);
+            if (!$doingbody) {
+                $response .= $block;
+                if (strpos($response, "\r\n\r\n")) {
+                    list($headers, $block) = explode("\r\n\r\n", $response, 2);
+                    $doingbody = true;
+                }
+            }
+
+            // Are we in body mode now?
+            if ($doingbody) {
+                $options['hooks']->dispatch('request.progress', array($block, $size, $this->max_bytes));
+                $data_length = strlen($block);
+                if ($this->max_bytes) {
+                    // Have we already hit a limit?
+                    if ($size === $this->max_bytes) {
+                        continue;
+                    }
+                    if (($size + $data_length) > $this->max_bytes) {
+                        // Limit the length
+                        $limited_length = ($this->max_bytes - $size);
+                        $block = substr($block, 0, $limited_length);
+                    }
+                }
+
+                $size += strlen($block);
+                if ($download) {
+                    fwrite($download, $block);
+                }
+                else {
+                    $body .= $block;
+                }
+            }
+        }
+        $this->headers = $headers;
+
+        if ($download) {
+            fclose($download);
+        }
+        else {
+            $this->headers .= "\r\n\r\n" . $body;
+        }
+        fclose($socket);
+
+        $options['hooks']->dispatch('fsockopen.after_request', array(&$this->headers, &$this->info));
+        return $this->headers;
+    }
+
+    /**
+     * Send multiple requests simultaneously
+     *
+     * @param array $requests Request data (array of 'url', 'headers', 'data', 'options') as per {@see Requests_Transport::request}
+     * @param array $options Global options, see {@see Requests::response()} for documentation
+     * @return array Array of Requests_Response objects (may contain Requests_Exception or string responses as well)
+     */
+    public function request_multiple($requests, $options) {
+        $responses = array();
+        $class = get_class($this);
+        foreach ($requests as $id => $request) {
+            try {
+                $handler = new $class();
+                $responses[$id] = $handler->request($request['url'], $request['headers'], $request['data'], $request['options']);
+
+                $request['options']['hooks']->dispatch('transport.internal.parse_response', array(&$responses[$id], $request));
+            }
+            catch (Requests_Exception $e) {
+                $responses[$id] = $e;
+            }
+
+            if (!is_string($responses[$id])) {
+                $request['options']['hooks']->dispatch('multiple.request.complete', array(&$responses[$id], $id));
+            }
+        }
+
+        return $responses;
+    }
+
+    /**
+     * Retrieve the encodings we can accept
+     *
+     * @return string Accept-Encoding header value
+     */
+    protected static function accept_encoding() {
+        $type = array();
+        if (function_exists('gzinflate')) {
+            $type[] = 'deflate;q=1.0';
+        }
+
+        if (function_exists('gzuncompress')) {
+            $type[] = 'compress;q=0.5';
+        }
+
+        $type[] = 'gzip;q=0.5';
+
+        return implode(', ', $type);
+    }
+
+    /**
+     * Format a URL given GET data
+     *
+     * @param array $url_parts
+     * @param array|object $data Data to build query using, see {@see https://secure.php.net/http_build_query}
+     * @return string URL with data
+     */
+    protected static function format_get($url_parts, $data) {
+        if (!empty($data)) {
+            if (empty($url_parts['query'])) {
+                $url_parts['query'] = '';
+            }
+
+            $url_parts['query'] .= '&' . http_build_query($data, null, '&');
+            $url_parts['query'] = trim($url_parts['query'], '&');
+        }
+        if (isset($url_parts['path'])) {
+            if (isset($url_parts['query'])) {
+                $get = $url_parts['path'] . '?' . $url_parts['query'];
+            }
+            else {
+                $get = $url_parts['path'];
+            }
+        }
+        else {
+            $get = '/';
+        }
+        return $get;
+    }
+
+    /**
+     * Error handler for stream_socket_client()
+     *
+     * @param int $errno Error number (e.g. E_WARNING)
+     * @param string $errstr Error message
+     */
+    public function connect_error_handler($errno, $errstr) {
+        // Double-check we can handle it
+        if (($errno & E_WARNING) === 0 && ($errno & E_NOTICE) === 0) {
+            // Return false to indicate the default error handler should engage
+            return false;
+        }
+
+        $this->connect_error .= $errstr . "\n";
+        return true;
+    }
+
+    /**
+     * Verify the certificate against common name and subject alternative names
+     *
+     * Unfortunately, PHP doesn't check the certificate against the alternative
+     * names, leading things like 'https://www.github.com/' to be invalid.
+     * Instead
+     *
+     * @see https://tools.ietf.org/html/rfc2818#section-3.1 RFC2818, Section 3.1
+     *
+     * @throws Requests_Exception On failure to connect via TLS (`fsockopen.ssl.connect_error`)
+     * @throws Requests_Exception On not obtaining a match for the host (`fsockopen.ssl.no_match`)
+     * @param string $host Host name to verify against
+     * @param resource $context Stream context
+     * @return bool
+     */
+    public function verify_certificate_from_context($host, $context) {
+        $meta = stream_context_get_options($context);
+
+        // If we don't have SSL options, then we couldn't make the connection at
+        // all
+        if (empty($meta) || empty($meta['ssl']) || empty($meta['ssl']['peer_certificate'])) {
+            throw new Requests_Exception(rtrim($this->connect_error), 'ssl.connect_error');
+        }
+
+        $cert = openssl_x509_parse($meta['ssl']['peer_certificate']);
+
+        return Requests_SSL::verify_certificate($host, $cert);
+    }
+
+    /**
+     * Whether this transport is valid
+     *
+     * @codeCoverageIgnore
+     * @return boolean True if the transport is valid, false otherwise.
+     */
+    public static function test($capabilities = array()) {
+        if (!function_exists('fsockopen')) {
+            return false;
+        }
+
+        // If needed, check that streams support SSL
+        if (isset($capabilities['ssl']) && $capabilities['ssl']) {
+            if (!extension_loaded('openssl') || !function_exists('openssl_x509_parse')) {
+                return false;
+            }
+
+            // Currently broken, thanks to https://github.com/facebook/hhvm/issues/2156
+            if (defined('HHVM_VERSION')) {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }

plugin/buycourses/src/Requests/SSL.php

Indentation +134 added lines, -134 removed lines

@@ -15,138 +15,138 @@
  * @subpackage Utilities
  */
 class Requests_SSL {
-	/**
-	 * Verify the certificate against common name and subject alternative names
-	 *
-	 * Unfortunately, PHP doesn't check the certificate against the alternative
-	 * names, leading things like 'https://www.github.com/' to be invalid.
-	 * Instead
-	 *
-	 * @see https://tools.ietf.org/html/rfc2818#section-3.1 RFC2818, Section 3.1
-	 *
-	 * @throws Requests_Exception On not obtaining a match for the host (`fsockopen.ssl.no_match`)
-	 * @param string $host Host name to verify against
-	 * @param array $cert Certificate data from openssl_x509_parse()
-	 * @return bool
-	 */
-	public static function verify_certificate($host, $cert) {
-		// Calculate the valid wildcard match if the host is not an IP address
-		$parts = explode('.', $host);
-		if (ip2long($host) === false) {
-			$parts[0] = '*';
-		}
-		$wildcard = implode('.', $parts);
-
-		$has_dns_alt = false;
-
-		// Check the subjectAltName
-		if (!empty($cert['extensions']) && !empty($cert['extensions']['subjectAltName'])) {
-			$altnames = explode(',', $cert['extensions']['subjectAltName']);
-			foreach ($altnames as $altname) {
-				$altname = trim($altname);
-				if (strpos($altname, 'DNS:') !== 0) {
-					continue;
-				}
-
-				$has_dns_alt = true;
-
-				// Strip the 'DNS:' prefix and trim whitespace
-				$altname = trim(substr($altname, 4));
-
-				// Check for a match
-				if (self::match_domain($host, $altname) === true) {
-					return true;
-				}
-			}
-		}
-
-		// Fall back to checking the common name if we didn't get any dNSName
-		// alt names, as per RFC2818
-		if (!$has_dns_alt && !empty($cert['subject']['CN'])) {
-			// Check for a match
-			if (self::match_domain($host, $cert['subject']['CN']) === true) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Verify that a reference name is valid
-	 *
-	 * Verifies a dNSName for HTTPS usage, (almost) as per Firefox's rules:
-	 * - Wildcards can only occur in a name with more than 3 components
-	 * - Wildcards can only occur as the last character in the first
-	 *   component
-	 * - Wildcards may be preceded by additional characters
-	 *
-	 * We modify these rules to be a bit stricter and only allow the wildcard
-	 * character to be the full first component; that is, with the exclusion of
-	 * the third rule.
-	 *
-	 * @param string $reference Reference dNSName
-	 * @return boolean Is the name valid?
-	 */
-	public static function verify_reference_name($reference) {
-		$parts = explode('.', $reference);
-
-		// Check the first part of the name
-		$first = array_shift($parts);
-
-		if (strpos($first, '*') !== false) {
-			// Check that the wildcard is the full part
-			if ($first !== '*') {
-				return false;
-			}
-
-			// Check that we have at least 3 components (including first)
-			if (count($parts) < 2) {
-				return false;
-			}
-		}
-
-		// Check the remaining parts
-		foreach ($parts as $part) {
-			if (strpos($part, '*') !== false) {
-				return false;
-			}
-		}
-
-		// Nothing found, verified!
-		return true;
-	}
-
-	/**
-	 * Match a hostname against a dNSName reference
-	 *
-	 * @param string $host Requested host
-	 * @param string $reference dNSName to match against
-	 * @return boolean Does the domain match?
-	 */
-	public static function match_domain($host, $reference) {
-		// Check if the reference is blacklisted first
-		if (self::verify_reference_name($reference) !== true) {
-			return false;
-		}
-
-		// Check for a direct match
-		if ($host === $reference) {
-			return true;
-		}
-
-		// Calculate the valid wildcard match if the host is not an IP address
-		// Also validates that the host has 3 parts or more, as per Firefox's
-		// ruleset.
-		if (ip2long($host) === false) {
-			$parts = explode('.', $host);
-			$parts[0] = '*';
-			$wildcard = implode('.', $parts);
-			if ($wildcard === $reference) {
-				return true;
-			}
-		}
-
-		return false;
-	}
+    /**
+     * Verify the certificate against common name and subject alternative names
+     *
+     * Unfortunately, PHP doesn't check the certificate against the alternative
+     * names, leading things like 'https://www.github.com/' to be invalid.
+     * Instead
+     *
+     * @see https://tools.ietf.org/html/rfc2818#section-3.1 RFC2818, Section 3.1
+     *
+     * @throws Requests_Exception On not obtaining a match for the host (`fsockopen.ssl.no_match`)
+     * @param string $host Host name to verify against
+     * @param array $cert Certificate data from openssl_x509_parse()
+     * @return bool
+     */
+    public static function verify_certificate($host, $cert) {
+        // Calculate the valid wildcard match if the host is not an IP address
+        $parts = explode('.', $host);
+        if (ip2long($host) === false) {
+            $parts[0] = '*';
+        }
+        $wildcard = implode('.', $parts);
+
+        $has_dns_alt = false;
+
+        // Check the subjectAltName
+        if (!empty($cert['extensions']) && !empty($cert['extensions']['subjectAltName'])) {
+            $altnames = explode(',', $cert['extensions']['subjectAltName']);
+            foreach ($altnames as $altname) {
+                $altname = trim($altname);
+                if (strpos($altname, 'DNS:') !== 0) {
+                    continue;
+                }
+
+                $has_dns_alt = true;
+
+                // Strip the 'DNS:' prefix and trim whitespace
+                $altname = trim(substr($altname, 4));
+
+                // Check for a match
+                if (self::match_domain($host, $altname) === true) {
+                    return true;
+                }
+            }
+        }
+
+        // Fall back to checking the common name if we didn't get any dNSName
+        // alt names, as per RFC2818
+        if (!$has_dns_alt && !empty($cert['subject']['CN'])) {
+            // Check for a match
+            if (self::match_domain($host, $cert['subject']['CN']) === true) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Verify that a reference name is valid
+     *
+     * Verifies a dNSName for HTTPS usage, (almost) as per Firefox's rules:
+     * - Wildcards can only occur in a name with more than 3 components
+     * - Wildcards can only occur as the last character in the first
+     *   component
+     * - Wildcards may be preceded by additional characters
+     *
+     * We modify these rules to be a bit stricter and only allow the wildcard
+     * character to be the full first component; that is, with the exclusion of
+     * the third rule.
+     *
+     * @param string $reference Reference dNSName
+     * @return boolean Is the name valid?
+     */
+    public static function verify_reference_name($reference) {
+        $parts = explode('.', $reference);
+
+        // Check the first part of the name
+        $first = array_shift($parts);
+
+        if (strpos($first, '*') !== false) {
+            // Check that the wildcard is the full part
+            if ($first !== '*') {
+                return false;
+            }
+
+            // Check that we have at least 3 components (including first)
+            if (count($parts) < 2) {
+                return false;
+            }
+        }
+
+        // Check the remaining parts
+        foreach ($parts as $part) {
+            if (strpos($part, '*') !== false) {
+                return false;
+            }
+        }
+
+        // Nothing found, verified!
+        return true;
+    }
+
+    /**
+     * Match a hostname against a dNSName reference
+     *
+     * @param string $host Requested host
+     * @param string $reference dNSName to match against
+     * @return boolean Does the domain match?
+     */
+    public static function match_domain($host, $reference) {
+        // Check if the reference is blacklisted first
+        if (self::verify_reference_name($reference) !== true) {
+            return false;
+        }
+
+        // Check for a direct match
+        if ($host === $reference) {
+            return true;
+        }
+
+        // Calculate the valid wildcard match if the host is not an IP address
+        // Also validates that the host has 3 parts or more, as per Firefox's
+        // ruleset.
+        if (ip2long($host) === false) {
+            $parts = explode('.', $host);
+            $parts[0] = '*';
+            $wildcard = implode('.', $parts);
+            if ($wildcard === $reference) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
\ No newline at end of file

plugin/buycourses/src/Requests/Hooks.php

Indentation +46 added lines, -46 removed lines

@@ -13,56 +13,56 @@
  * @subpackage Utilities
  */
 class Requests_Hooks implements Requests_Hooker {
-	/**
-	 * Registered callbacks for each hook
-	 *
-	 * @var array
-	 */
-	protected $hooks = array();
+    /**
+     * Registered callbacks for each hook
+     *
+     * @var array
+     */
+    protected $hooks = array();
 
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		// pass
-	}
+    /**
+     * Constructor
+     */
+    public function __construct() {
+        // pass
+    }
 
-	/**
-	 * Register a callback for a hook
-	 *
-	 * @param string $hook Hook name
-	 * @param callback $callback Function/method to call on event
-	 * @param int $priority Priority number. <0 is executed earlier, >0 is executed later
-	 */
-	public function register($hook, $callback, $priority = 0) {
-		if (!isset($this->hooks[$hook])) {
-			$this->hooks[$hook] = array();
-		}
-		if (!isset($this->hooks[$hook][$priority])) {
-			$this->hooks[$hook][$priority] = array();
-		}
+    /**
+     * Register a callback for a hook
+     *
+     * @param string $hook Hook name
+     * @param callback $callback Function/method to call on event
+     * @param int $priority Priority number. <0 is executed earlier, >0 is executed later
+     */
+    public function register($hook, $callback, $priority = 0) {
+        if (!isset($this->hooks[$hook])) {
+            $this->hooks[$hook] = array();
+        }
+        if (!isset($this->hooks[$hook][$priority])) {
+            $this->hooks[$hook][$priority] = array();
+        }
 
-		$this->hooks[$hook][$priority][] = $callback;
-	}
+        $this->hooks[$hook][$priority][] = $callback;
+    }
 
-	/**
-	 * Dispatch a message
-	 *
-	 * @param string $hook Hook name
-	 * @param array $parameters Parameters to pass to callbacks
-	 * @return boolean Successfulness
-	 */
-	public function dispatch($hook, $parameters = array()) {
-		if (empty($this->hooks[$hook])) {
-			return false;
-		}
+    /**
+     * Dispatch a message
+     *
+     * @param string $hook Hook name
+     * @param array $parameters Parameters to pass to callbacks
+     * @return boolean Successfulness
+     */
+    public function dispatch($hook, $parameters = array()) {
+        if (empty($this->hooks[$hook])) {
+            return false;
+        }
 
-		foreach ($this->hooks[$hook] as $priority => $hooked) {
-			foreach ($hooked as $callback) {
-				call_user_func_array($callback, $parameters);
-			}
-		}
+        foreach ($this->hooks[$hook] as $priority => $hooked) {
+            foreach ($hooked as $callback) {
+                call_user_func_array($callback, $parameters);
+            }
+        }
 
-		return true;
-	}
+        return true;
+    }
 }
\ No newline at end of file

plugin/buycourses/src/Requests/Transport.php

Indentation +23 added lines, -23 removed lines

@@ -13,29 +13,29 @@
  * @subpackage Transport
  */
 interface Requests_Transport {
-	/**
-	 * Perform a request
-	 *
-	 * @param string $url URL to request
-	 * @param array $headers Associative array of request headers
-	 * @param string|array $data Data to send either as the POST body, or as parameters in the URL for a GET/HEAD
-	 * @param array $options Request options, see {@see Requests::response()} for documentation
-	 * @return string Raw HTTP result
-	 */
-	public function request($url, $headers = array(), $data = array(), $options = array());
+    /**
+     * Perform a request
+     *
+     * @param string $url URL to request
+     * @param array $headers Associative array of request headers
+     * @param string|array $data Data to send either as the POST body, or as parameters in the URL for a GET/HEAD
+     * @param array $options Request options, see {@see Requests::response()} for documentation
+     * @return string Raw HTTP result
+     */
+    public function request($url, $headers = array(), $data = array(), $options = array());
 
-	/**
-	 * Send multiple requests simultaneously
-	 *
-	 * @param array $requests Request data (array of 'url', 'headers', 'data', 'options') as per {@see Requests_Transport::request}
-	 * @param array $options Global options, see {@see Requests::response()} for documentation
-	 * @return array Array of Requests_Response objects (may contain Requests_Exception or string responses as well)
-	 */
-	public function request_multiple($requests, $options);
+    /**
+     * Send multiple requests simultaneously
+     *
+     * @param array $requests Request data (array of 'url', 'headers', 'data', 'options') as per {@see Requests_Transport::request}
+     * @param array $options Global options, see {@see Requests::response()} for documentation
+     * @return array Array of Requests_Response objects (may contain Requests_Exception or string responses as well)
+     */
+    public function request_multiple($requests, $options);
 
-	/**
-	 * Self-test whether the transport can be used
-	 * @return bool
-	 */
-	public static function test();
+    /**
+     * Self-test whether the transport can be used
+     * @return bool
+     */
+    public static function test();
 }
\ No newline at end of file

plugin/buycourses/src/Requests/IRI.php

Indentation +1017 added lines, -1017 removed lines

@@ -64,1021 +64,1021 @@
  * @property string $ifragment Fragment part of the IRI (after '#')
  */
 class Requests_IRI {
-	/**
-	 * Scheme
-	 *
-	 * @var string
-	 */
-	protected $scheme = null;
-
-	/**
-	 * User Information
-	 *
-	 * @var string
-	 */
-	protected $iuserinfo = null;
-
-	/**
-	 * ihost
-	 *
-	 * @var string
-	 */
-	protected $ihost = null;
-
-	/**
-	 * Port
-	 *
-	 * @var string
-	 */
-	protected $port = null;
-
-	/**
-	 * ipath
-	 *
-	 * @var string
-	 */
-	protected $ipath = '';
-
-	/**
-	 * iquery
-	 *
-	 * @var string
-	 */
-	protected $iquery = null;
-
-	/**
-	 * ifragment
-	 *
-	 * @var string
-	 */
-	protected $ifragment = null;
-
-	/**
-	 * Normalization database
-	 *
-	 * Each key is the scheme, each value is an array with each key as the IRI
-	 * part and value as the default value for that part.
-	 */
-	protected $normalization = array(
-		'acap' => array(
-			'port' => 674
-		),
-		'dict' => array(
-			'port' => 2628
-		),
-		'file' => array(
-			'ihost' => 'localhost'
-		),
-		'http' => array(
-			'port' => 80,
-		),
-		'https' => array(
-			'port' => 443,
-		),
-	);
-
-	/**
-	 * Return the entire IRI when you try and read the object as a string
-	 *
-	 * @return string
-	 */
-	public function __toString() {
-		return $this->get_iri();
-	}
-
-	/**
-	 * Overload __set() to provide access via properties
-	 *
-	 * @param string $name Property name
-	 * @param mixed $value Property value
-	 */
-	public function __set($name, $value) {
-		if (method_exists($this, 'set_' . $name)) {
-			call_user_func(array($this, 'set_' . $name), $value);
-		}
-		elseif (
-			   $name === 'iauthority'
-			|| $name === 'iuserinfo'
-			|| $name === 'ihost'
-			|| $name === 'ipath'
-			|| $name === 'iquery'
-			|| $name === 'ifragment'
-		) {
-			call_user_func(array($this, 'set_' . substr($name, 1)), $value);
-		}
-	}
-
-	/**
-	 * Overload __get() to provide access via properties
-	 *
-	 * @param string $name Property name
-	 * @return mixed
-	 */
-	public function __get($name) {
-		// isset() returns false for null, we don't want to do that
-		// Also why we use array_key_exists below instead of isset()
-		$props = get_object_vars($this);
-
-		if (
-			$name === 'iri' ||
-			$name === 'uri' ||
-			$name === 'iauthority' ||
-			$name === 'authority'
-		) {
-			$method = 'get_' . $name;
-			$return = $this->$method();
-		}
-		elseif (array_key_exists($name, $props)) {
-			$return = $this->$name;
-		}
-		// host -> ihost
-		elseif (($prop = 'i' . $name) && array_key_exists($prop, $props)) {
-			$name = $prop;
-			$return = $this->$prop;
-		}
-		// ischeme -> scheme
-		elseif (($prop = substr($name, 1)) && array_key_exists($prop, $props)) {
-			$name = $prop;
-			$return = $this->$prop;
-		}
-		else {
-			trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
-			$return = null;
-		}
-
-		if ($return === null && isset($this->normalization[$this->scheme][$name])) {
-			return $this->normalization[$this->scheme][$name];
-		}
-		else {
-			return $return;
-		}
-	}
-
-	/**
-	 * Overload __isset() to provide access via properties
-	 *
-	 * @param string $name Property name
-	 * @return bool
-	 */
-	public function __isset($name) {
-		return (method_exists($this, 'get_' . $name) || isset($this->$name));
-	}
-
-	/**
-	 * Overload __unset() to provide access via properties
-	 *
-	 * @param string $name Property name
-	 */
-	public function __unset($name) {
-		if (method_exists($this, 'set_' . $name)) {
-			call_user_func(array($this, 'set_' . $name), '');
-		}
-	}
-
-	/**
-	 * Create a new IRI object, from a specified string
-	 *
-	 * @param string|null $iri
-	 */
-	public function __construct($iri = null) {
-		$this->set_iri($iri);
-	}
-
-	/**
-	 * Create a new IRI object by resolving a relative IRI
-	 *
-	 * Returns false if $base is not absolute, otherwise an IRI.
-	 *
-	 * @param IRI|string $base (Absolute) Base IRI
-	 * @param IRI|string $relative Relative IRI
-	 * @return IRI|false
-	 */
-	public static function absolutize($base, $relative) {
-		if (!($relative instanceof Requests_IRI)) {
-			$relative = new Requests_IRI($relative);
-		}
-		if (!$relative->is_valid()) {
-			return false;
-		}
-		elseif ($relative->scheme !== null) {
-			return clone $relative;
-		}
-
-		if (!($base instanceof Requests_IRI)) {
-			$base = new Requests_IRI($base);
-		}
-		if ($base->scheme === null || !$base->is_valid()) {
-			return false;
-		}
-
-		if ($relative->get_iri() !== '') {
-			if ($relative->iuserinfo !== null || $relative->ihost !== null || $relative->port !== null) {
-				$target = clone $relative;
-				$target->scheme = $base->scheme;
-			}
-			else {
-				$target = new Requests_IRI;
-				$target->scheme = $base->scheme;
-				$target->iuserinfo = $base->iuserinfo;
-				$target->ihost = $base->ihost;
-				$target->port = $base->port;
-				if ($relative->ipath !== '') {
-					if ($relative->ipath[0] === '/') {
-						$target->ipath = $relative->ipath;
-					}
-					elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '') {
-						$target->ipath = '/' . $relative->ipath;
-					}
-					elseif (($last_segment = strrpos($base->ipath, '/')) !== false) {
-						$target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
-					}
-					else {
-						$target->ipath = $relative->ipath;
-					}
-					$target->ipath = $target->remove_dot_segments($target->ipath);
-					$target->iquery = $relative->iquery;
-				}
-				else {
-					$target->ipath = $base->ipath;
-					if ($relative->iquery !== null) {
-						$target->iquery = $relative->iquery;
-					}
-					elseif ($base->iquery !== null) {
-						$target->iquery = $base->iquery;
-					}
-				}
-				$target->ifragment = $relative->ifragment;
-			}
-		}
-		else {
-			$target = clone $base;
-			$target->ifragment = null;
-		}
-		$target->scheme_normalization();
-		return $target;
-	}
-
-	/**
-	 * Parse an IRI into scheme/authority/path/query/fragment segments
-	 *
-	 * @param string $iri
-	 * @return array
-	 */
-	protected function parse_iri($iri) {
-		$iri = trim($iri, "\x20\x09\x0A\x0C\x0D");
-		$has_match = preg_match('/^((?P<scheme>[^:\/?#]+):)?(\/\/(?P<authority>[^\/?#]*))?(?P<path>[^?#]*)(\?(?P<query>[^#]*))?(#(?P<fragment>.*))?$/', $iri, $match);
-		if (!$has_match) {
-			throw new Requests_Exception('Cannot parse supplied IRI', 'iri.cannot_parse', $iri);
-		}
-
-		if ($match[1] === '') {
-			$match['scheme'] = null;
-		}
-		if (!isset($match[3]) || $match[3] === '') {
-			$match['authority'] = null;
-		}
-		if (!isset($match[5])) {
-			$match['path'] = '';
-		}
-		if (!isset($match[6]) || $match[6] === '') {
-			$match['query'] = null;
-		}
-		if (!isset($match[8]) || $match[8] === '') {
-			$match['fragment'] = null;
-		}
-		return $match;
-	}
-
-	/**
-	 * Remove dot segments from a path
-	 *
-	 * @param string $input
-	 * @return string
-	 */
-	protected function remove_dot_segments($input) {
-		$output = '';
-		while (strpos($input, './') !== false || strpos($input, '/.') !== false || $input === '.' || $input === '..') {
-			// A: If the input buffer begins with a prefix of "../" or "./",
-			// then remove that prefix from the input buffer; otherwise,
-			if (strpos($input, '../') === 0) {
-				$input = substr($input, 3);
-			}
-			elseif (strpos($input, './') === 0) {
-				$input = substr($input, 2);
-			}
-			// B: if the input buffer begins with a prefix of "/./" or "/.",
-			// where "." is a complete path segment, then replace that prefix
-			// with "/" in the input buffer; otherwise,
-			elseif (strpos($input, '/./') === 0) {
-				$input = substr($input, 2);
-			}
-			elseif ($input === '/.') {
-				$input = '/';
-			}
-			// C: if the input buffer begins with a prefix of "/../" or "/..",
-			// where ".." is a complete path segment, then replace that prefix
-			// with "/" in the input buffer and remove the last segment and its
-			// preceding "/" (if any) from the output buffer; otherwise,
-			elseif (strpos($input, '/../') === 0) {
-				$input = substr($input, 3);
-				$output = substr_replace($output, '', strrpos($output, '/'));
-			}
-			elseif ($input === '/..') {
-				$input = '/';
-				$output = substr_replace($output, '', strrpos($output, '/'));
-			}
-			// D: if the input buffer consists only of "." or "..", then remove
-			// that from the input buffer; otherwise,
-			elseif ($input === '.' || $input === '..') {
-				$input = '';
-			}
-			// E: move the first path segment in the input buffer to the end of
-			// the output buffer, including the initial "/" character (if any)
-			// and any subsequent characters up to, but not including, the next
-			// "/" character or the end of the input buffer
-			elseif (($pos = strpos($input, '/', 1)) !== false) {
-				$output .= substr($input, 0, $pos);
-				$input = substr_replace($input, '', 0, $pos);
-			}
-			else {
-				$output .= $input;
-				$input = '';
-			}
-		}
-		return $output . $input;
-	}
-
-	/**
-	 * Replace invalid character with percent encoding
-	 *
-	 * @param string $string Input string
-	 * @param string $extra_chars Valid characters not in iunreserved or
-	 *                            iprivate (this is ASCII-only)
-	 * @param bool $iprivate Allow iprivate
-	 * @return string
-	 */
-	protected function replace_invalid_with_pct_encoding($string, $extra_chars, $iprivate = false) {
-		// Normalize as many pct-encoded sections as possible
-		$string = preg_replace_callback('/(?:%[A-Fa-f0-9]{2})+/', array(&$this, 'remove_iunreserved_percent_encoded'), $string);
-
-		// Replace invalid percent characters
-		$string = preg_replace('/%(?![A-Fa-f0-9]{2})/', '%25', $string);
-
-		// Add unreserved and % to $extra_chars (the latter is safe because all
-		// pct-encoded sections are now valid).
-		$extra_chars .= 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~%';
-
-		// Now replace any bytes that aren't allowed with their pct-encoded versions
-		$position = 0;
-		$strlen = strlen($string);
-		while (($position += strspn($string, $extra_chars, $position)) < $strlen) {
-			$value = ord($string[$position]);
-
-			// Start position
-			$start = $position;
-
-			// By default we are valid
-			$valid = true;
-
-			// No one byte sequences are valid due to the while.
-			// Two byte sequence:
-			if (($value & 0xE0) === 0xC0) {
-				$character = ($value & 0x1F) << 6;
-				$length = 2;
-				$remaining = 1;
-			}
-			// Three byte sequence:
-			elseif (($value & 0xF0) === 0xE0) {
-				$character = ($value & 0x0F) << 12;
-				$length = 3;
-				$remaining = 2;
-			}
-			// Four byte sequence:
-			elseif (($value & 0xF8) === 0xF0) {
-				$character = ($value & 0x07) << 18;
-				$length = 4;
-				$remaining = 3;
-			}
-			// Invalid byte:
-			else {
-				$valid = false;
-				$length = 1;
-				$remaining = 0;
-			}
-
-			if ($remaining) {
-				if ($position + $length <= $strlen) {
-					for ($position++; $remaining; $position++) {
-						$value = ord($string[$position]);
-
-						// Check that the byte is valid, then add it to the character:
-						if (($value & 0xC0) === 0x80) {
-							$character |= ($value & 0x3F) << (--$remaining * 6);
-						}
-						// If it is invalid, count the sequence as invalid and reprocess the current byte:
-						else {
-							$valid = false;
-							$position--;
-							break;
-						}
-					}
-				}
-				else {
-					$position = $strlen - 1;
-					$valid = false;
-				}
-			}
-
-			// Percent encode anything invalid or not in ucschar
-			if (
-				// Invalid sequences
-				!$valid
-				// Non-shortest form sequences are invalid
-				|| $length > 1 && $character <= 0x7F
-				|| $length > 2 && $character <= 0x7FF
-				|| $length > 3 && $character <= 0xFFFF
-				// Outside of range of ucschar codepoints
-				// Noncharacters
-				|| ($character & 0xFFFE) === 0xFFFE
-				|| $character >= 0xFDD0 && $character <= 0xFDEF
-				|| (
-					// Everything else not in ucschar
-					   $character > 0xD7FF && $character < 0xF900
-					|| $character < 0xA0
-					|| $character > 0xEFFFD
-				)
-				&& (
-					// Everything not in iprivate, if it applies
-					   !$iprivate
-					|| $character < 0xE000
-					|| $character > 0x10FFFD
-				)
-			) {
-				// If we were a character, pretend we weren't, but rather an error.
-				if ($valid) {
-					$position--;
-				}
-
-				for ($j = $start; $j <= $position; $j++) {
-					$string = substr_replace($string, sprintf('%%%02X', ord($string[$j])), $j, 1);
-					$j += 2;
-					$position += 2;
-					$strlen += 2;
-				}
-			}
-		}
-
-		return $string;
-	}
-
-	/**
-	 * Callback function for preg_replace_callback.
-	 *
-	 * Removes sequences of percent encoded bytes that represent UTF-8
-	 * encoded characters in iunreserved
-	 *
-	 * @param array $match PCRE match
-	 * @return string Replacement
-	 */
-	protected function remove_iunreserved_percent_encoded($match) {
-		// As we just have valid percent encoded sequences we can just explode
-		// and ignore the first member of the returned array (an empty string).
-		$bytes = explode('%', $match[0]);
-
-		// Initialize the new string (this is what will be returned) and that
-		// there are no bytes remaining in the current sequence (unsurprising
-		// at the first byte!).
-		$string = '';
-		$remaining = 0;
-
-		// Loop over each and every byte, and set $value to its value
-		for ($i = 1, $len = count($bytes); $i < $len; $i++) {
-			$value = hexdec($bytes[$i]);
-
-			// If we're the first byte of sequence:
-			if (!$remaining) {
-				// Start position
-				$start = $i;
-
-				// By default we are valid
-				$valid = true;
-
-				// One byte sequence:
-				if ($value <= 0x7F) {
-					$character = $value;
-					$length = 1;
-				}
-				// Two byte sequence:
-				elseif (($value & 0xE0) === 0xC0) {
-					$character = ($value & 0x1F) << 6;
-					$length = 2;
-					$remaining = 1;
-				}
-				// Three byte sequence:
-				elseif (($value & 0xF0) === 0xE0) {
-					$character = ($value & 0x0F) << 12;
-					$length = 3;
-					$remaining = 2;
-				}
-				// Four byte sequence:
-				elseif (($value & 0xF8) === 0xF0) {
-					$character = ($value & 0x07) << 18;
-					$length = 4;
-					$remaining = 3;
-				}
-				// Invalid byte:
-				else {
-					$valid = false;
-					$remaining = 0;
-				}
-			}
-			// Continuation byte:
-			else {
-				// Check that the byte is valid, then add it to the character:
-				if (($value & 0xC0) === 0x80) {
-					$remaining--;
-					$character |= ($value & 0x3F) << ($remaining * 6);
-				}
-				// If it is invalid, count the sequence as invalid and reprocess the current byte as the start of a sequence:
-				else {
-					$valid = false;
-					$remaining = 0;
-					$i--;
-				}
-			}
-
-			// If we've reached the end of the current byte sequence, append it to Unicode::$data
-			if (!$remaining) {
-				// Percent encode anything invalid or not in iunreserved
-				if (
-					// Invalid sequences
-					!$valid
-					// Non-shortest form sequences are invalid
-					|| $length > 1 && $character <= 0x7F
-					|| $length > 2 && $character <= 0x7FF
-					|| $length > 3 && $character <= 0xFFFF
-					// Outside of range of iunreserved codepoints
-					|| $character < 0x2D
-					|| $character > 0xEFFFD
-					// Noncharacters
-					|| ($character & 0xFFFE) === 0xFFFE
-					|| $character >= 0xFDD0 && $character <= 0xFDEF
-					// Everything else not in iunreserved (this is all BMP)
-					|| $character === 0x2F
-					|| $character > 0x39 && $character < 0x41
-					|| $character > 0x5A && $character < 0x61
-					|| $character > 0x7A && $character < 0x7E
-					|| $character > 0x7E && $character < 0xA0
-					|| $character > 0xD7FF && $character < 0xF900
-				) {
-					for ($j = $start; $j <= $i; $j++) {
-						$string .= '%' . strtoupper($bytes[$j]);
-					}
-				}
-				else {
-					for ($j = $start; $j <= $i; $j++) {
-						$string .= chr(hexdec($bytes[$j]));
-					}
-				}
-			}
-		}
-
-		// If we have any bytes left over they are invalid (i.e., we are
-		// mid-way through a multi-byte sequence)
-		if ($remaining) {
-			for ($j = $start; $j < $len; $j++) {
-				$string .= '%' . strtoupper($bytes[$j]);
-			}
-		}
-
-		return $string;
-	}
-
-	protected function scheme_normalization() {
-		if (isset($this->normalization[$this->scheme]['iuserinfo']) && $this->iuserinfo === $this->normalization[$this->scheme]['iuserinfo']) {
-			$this->iuserinfo = null;
-		}
-		if (isset($this->normalization[$this->scheme]['ihost']) && $this->ihost === $this->normalization[$this->scheme]['ihost']) {
-			$this->ihost = null;
-		}
-		if (isset($this->normalization[$this->scheme]['port']) && $this->port === $this->normalization[$this->scheme]['port']) {
-			$this->port = null;
-		}
-		if (isset($this->normalization[$this->scheme]['ipath']) && $this->ipath === $this->normalization[$this->scheme]['ipath']) {
-			$this->ipath = '';
-		}
-		if (isset($this->ihost) && empty($this->ipath)) {
-			$this->ipath = '/';
-		}
-		if (isset($this->normalization[$this->scheme]['iquery']) && $this->iquery === $this->normalization[$this->scheme]['iquery']) {
-			$this->iquery = null;
-		}
-		if (isset($this->normalization[$this->scheme]['ifragment']) && $this->ifragment === $this->normalization[$this->scheme]['ifragment']) {
-			$this->ifragment = null;
-		}
-	}
-
-	/**
-	 * Check if the object represents a valid IRI. This needs to be done on each
-	 * call as some things change depending on another part of the IRI.
-	 *
-	 * @return bool
-	 */
-	public function is_valid() {
-		$isauthority = $this->iuserinfo !== null || $this->ihost !== null || $this->port !== null;
-		if ($this->ipath !== '' &&
-			(
-				$isauthority && $this->ipath[0] !== '/' ||
-				(
-					$this->scheme === null &&
-					!$isauthority &&
-					strpos($this->ipath, ':') !== false &&
-					(strpos($this->ipath, '/') === false ? true : strpos($this->ipath, ':') < strpos($this->ipath, '/'))
-				)
-			)
-		) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Set the entire IRI. Returns true on success, false on failure (if there
-	 * are any invalid characters).
-	 *
-	 * @param string $iri
-	 * @return bool
-	 */
-	protected function set_iri($iri) {
-		static $cache;
-		if (!$cache) {
-			$cache = array();
-		}
-
-		if ($iri === null) {
-			return true;
-		}
-		if (isset($cache[$iri])) {
-			list($this->scheme,
-				 $this->iuserinfo,
-				 $this->ihost,
-				 $this->port,
-				 $this->ipath,
-				 $this->iquery,
-				 $this->ifragment,
-				 $return) = $cache[$iri];
-			return $return;
-		}
-
-		$parsed = $this->parse_iri((string) $iri);
-
-		$return = $this->set_scheme($parsed['scheme'])
-			&& $this->set_authority($parsed['authority'])
-			&& $this->set_path($parsed['path'])
-			&& $this->set_query($parsed['query'])
-			&& $this->set_fragment($parsed['fragment']);
-
-		$cache[$iri] = array($this->scheme,
-							 $this->iuserinfo,
-							 $this->ihost,
-							 $this->port,
-							 $this->ipath,
-							 $this->iquery,
-							 $this->ifragment,
-							 $return);
-		return $return;
-	}
-
-	/**
-	 * Set the scheme. Returns true on success, false on failure (if there are
-	 * any invalid characters).
-	 *
-	 * @param string $scheme
-	 * @return bool
-	 */
-	protected function set_scheme($scheme) {
-		if ($scheme === null) {
-			$this->scheme = null;
-		}
-		elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme)) {
-			$this->scheme = null;
-			return false;
-		}
-		else {
-			$this->scheme = strtolower($scheme);
-		}
-		return true;
-	}
-
-	/**
-	 * Set the authority. Returns true on success, false on failure (if there are
-	 * any invalid characters).
-	 *
-	 * @param string $authority
-	 * @return bool
-	 */
-	protected function set_authority($authority) {
-		static $cache;
-		if (!$cache) {
-			$cache = array();
-		}
-
-		if ($authority === null) {
-			$this->iuserinfo = null;
-			$this->ihost = null;
-			$this->port = null;
-			return true;
-		}
-		if (isset($cache[$authority])) {
-			list($this->iuserinfo,
-				 $this->ihost,
-				 $this->port,
-				 $return) = $cache[$authority];
-
-			return $return;
-		}
-
-		$remaining = $authority;
-		if (($iuserinfo_end = strrpos($remaining, '@')) !== false) {
-			$iuserinfo = substr($remaining, 0, $iuserinfo_end);
-			$remaining = substr($remaining, $iuserinfo_end + 1);
-		}
-		else {
-			$iuserinfo = null;
-		}
-		if (($port_start = strpos($remaining, ':', strpos($remaining, ']'))) !== false) {
-			$port = substr($remaining, $port_start + 1);
-			if ($port === false || $port === '') {
-				$port = null;
-			}
-			$remaining = substr($remaining, 0, $port_start);
-		}
-		else {
-			$port = null;
-		}
-
-		$return = $this->set_userinfo($iuserinfo) &&
-				  $this->set_host($remaining) &&
-				  $this->set_port($port);
-
-		$cache[$authority] = array($this->iuserinfo,
-								   $this->ihost,
-								   $this->port,
-								   $return);
-
-		return $return;
-	}
-
-	/**
-	 * Set the iuserinfo.
-	 *
-	 * @param string $iuserinfo
-	 * @return bool
-	 */
-	protected function set_userinfo($iuserinfo) {
-		if ($iuserinfo === null) {
-			$this->iuserinfo = null;
-		}
-		else {
-			$this->iuserinfo = $this->replace_invalid_with_pct_encoding($iuserinfo, '!$&\'()*+,;=:');
-			$this->scheme_normalization();
-		}
-
-		return true;
-	}
-
-	/**
-	 * Set the ihost. Returns true on success, false on failure (if there are
-	 * any invalid characters).
-	 *
-	 * @param string $ihost
-	 * @return bool
-	 */
-	protected function set_host($ihost) {
-		if ($ihost === null) {
-			$this->ihost = null;
-			return true;
-		}
-		if (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']') {
-			if (Requests_IPv6::check_ipv6(substr($ihost, 1, -1))) {
-				$this->ihost = '[' . Requests_IPv6::compress(substr($ihost, 1, -1)) . ']';
-			}
-			else {
-				$this->ihost = null;
-				return false;
-			}
-		}
-		else {
-			$ihost = $this->replace_invalid_with_pct_encoding($ihost, '!$&\'()*+,;=');
-
-			// Lowercase, but ignore pct-encoded sections (as they should
-			// remain uppercase). This must be done after the previous step
-			// as that can add unescaped characters.
-			$position = 0;
-			$strlen = strlen($ihost);
-			while (($position += strcspn($ihost, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ%', $position)) < $strlen) {
-				if ($ihost[$position] === '%') {
-					$position += 3;
-				}
-				else {
-					$ihost[$position] = strtolower($ihost[$position]);
-					$position++;
-				}
-			}
-
-			$this->ihost = $ihost;
-		}
-
-		$this->scheme_normalization();
-
-		return true;
-	}
-
-	/**
-	 * Set the port. Returns true on success, false on failure (if there are
-	 * any invalid characters).
-	 *
-	 * @param string $port
-	 * @return bool
-	 */
-	protected function set_port($port) {
-		if ($port === null) {
-			$this->port = null;
-			return true;
-		}
-
-		if (strspn($port, '0123456789') === strlen($port)) {
-			$this->port = (int) $port;
-			$this->scheme_normalization();
-			return true;
-		}
-
-		$this->port = null;
-		return false;
-	}
-
-	/**
-	 * Set the ipath.
-	 *
-	 * @param string $ipath
-	 * @return bool
-	 */
-	protected function set_path($ipath) {
-		static $cache;
-		if (!$cache) {
-			$cache = array();
-		}
-
-		$ipath = (string) $ipath;
-
-		if (isset($cache[$ipath])) {
-			$this->ipath = $cache[$ipath][(int) ($this->scheme !== null)];
-		}
-		else {
-			$valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/');
-			$removed = $this->remove_dot_segments($valid);
-
-			$cache[$ipath] = array($valid, $removed);
-			$this->ipath = ($this->scheme !== null) ? $removed : $valid;
-		}
-		$this->scheme_normalization();
-		return true;
-	}
-
-	/**
-	 * Set the iquery.
-	 *
-	 * @param string $iquery
-	 * @return bool
-	 */
-	protected function set_query($iquery) {
-		if ($iquery === null) {
-			$this->iquery = null;
-		}
-		else {
-			$this->iquery = $this->replace_invalid_with_pct_encoding($iquery, '!$&\'()*+,;=:@/?', true);
-			$this->scheme_normalization();
-		}
-		return true;
-	}
-
-	/**
-	 * Set the ifragment.
-	 *
-	 * @param string $ifragment
-	 * @return bool
-	 */
-	protected function set_fragment($ifragment) {
-		if ($ifragment === null) {
-			$this->ifragment = null;
-		}
-		else {
-			$this->ifragment = $this->replace_invalid_with_pct_encoding($ifragment, '!$&\'()*+,;=:@/?');
-			$this->scheme_normalization();
-		}
-		return true;
-	}
-
-	/**
-	 * Convert an IRI to a URI (or parts thereof)
-	 *
-	 * @param string|bool IRI to convert (or false from {@see get_iri})
-	 * @return string|false URI if IRI is valid, false otherwise.
-	 */
-	protected function to_uri($string) {
-		if (!is_string($string)) {
-			return false;
-		}
-
-		static $non_ascii;
-		if (!$non_ascii) {
-			$non_ascii = implode('', range("\x80", "\xFF"));
-		}
-
-		$position = 0;
-		$strlen = strlen($string);
-		while (($position += strcspn($string, $non_ascii, $position)) < $strlen) {
-			$string = substr_replace($string, sprintf('%%%02X', ord($string[$position])), $position, 1);
-			$position += 3;
-			$strlen += 2;
-		}
-
-		return $string;
-	}
-
-	/**
-	 * Get the complete IRI
-	 *
-	 * @return string
-	 */
-	protected function get_iri() {
-		if (!$this->is_valid()) {
-			return false;
-		}
-
-		$iri = '';
-		if ($this->scheme !== null) {
-			$iri .= $this->scheme . ':';
-		}
-		if (($iauthority = $this->get_iauthority()) !== null) {
-			$iri .= '//' . $iauthority;
-		}
-		$iri .= $this->ipath;
-		if ($this->iquery !== null) {
-			$iri .= '?' . $this->iquery;
-		}
-		if ($this->ifragment !== null) {
-			$iri .= '#' . $this->ifragment;
-		}
-
-		return $iri;
-	}
-
-	/**
-	 * Get the complete URI
-	 *
-	 * @return string
-	 */
-	protected function get_uri() {
-		return $this->to_uri($this->get_iri());
-	}
-
-	/**
-	 * Get the complete iauthority
-	 *
-	 * @return string
-	 */
-	protected function get_iauthority() {
-		if ($this->iuserinfo === null && $this->ihost === null && $this->port === null) {
-			return null;
-		}
-
-		$iauthority = '';
-		if ($this->iuserinfo !== null) {
-			$iauthority .= $this->iuserinfo . '@';
-		}
-		if ($this->ihost !== null) {
-			$iauthority .= $this->ihost;
-		}
-		if ($this->port !== null) {
-			$iauthority .= ':' . $this->port;
-		}
-		return $iauthority;
-	}
-
-	/**
-	 * Get the complete authority
-	 *
-	 * @return string
-	 */
-	protected function get_authority() {
-		$iauthority = $this->get_iauthority();
-		if (is_string($iauthority)) {
-			return $this->to_uri($iauthority);
-		}
-		else {
-			return $iauthority;
-		}
-	}
+    /**
+     * Scheme
+     *
+     * @var string
+     */
+    protected $scheme = null;
+
+    /**
+     * User Information
+     *
+     * @var string
+     */
+    protected $iuserinfo = null;
+
+    /**
+     * ihost
+     *
+     * @var string
+     */
+    protected $ihost = null;
+
+    /**
+     * Port
+     *
+     * @var string
+     */
+    protected $port = null;
+
+    /**
+     * ipath
+     *
+     * @var string
+     */
+    protected $ipath = '';
+
+    /**
+     * iquery
+     *
+     * @var string
+     */
+    protected $iquery = null;
+
+    /**
+     * ifragment
+     *
+     * @var string
+     */
+    protected $ifragment = null;
+
+    /**
+     * Normalization database
+     *
+     * Each key is the scheme, each value is an array with each key as the IRI
+     * part and value as the default value for that part.
+     */
+    protected $normalization = array(
+        'acap' => array(
+            'port' => 674
+        ),
+        'dict' => array(
+            'port' => 2628
+        ),
+        'file' => array(
+            'ihost' => 'localhost'
+        ),
+        'http' => array(
+            'port' => 80,
+        ),
+        'https' => array(
+            'port' => 443,
+        ),
+    );
+
+    /**
+     * Return the entire IRI when you try and read the object as a string
+     *
+     * @return string
+     */
+    public function __toString() {
+        return $this->get_iri();
+    }
+
+    /**
+     * Overload __set() to provide access via properties
+     *
+     * @param string $name Property name
+     * @param mixed $value Property value
+     */
+    public function __set($name, $value) {
+        if (method_exists($this, 'set_' . $name)) {
+            call_user_func(array($this, 'set_' . $name), $value);
+        }
+        elseif (
+                $name === 'iauthority'
+            || $name === 'iuserinfo'
+            || $name === 'ihost'
+            || $name === 'ipath'
+            || $name === 'iquery'
+            || $name === 'ifragment'
+        ) {
+            call_user_func(array($this, 'set_' . substr($name, 1)), $value);
+        }
+    }
+
+    /**
+     * Overload __get() to provide access via properties
+     *
+     * @param string $name Property name
+     * @return mixed
+     */
+    public function __get($name) {
+        // isset() returns false for null, we don't want to do that
+        // Also why we use array_key_exists below instead of isset()
+        $props = get_object_vars($this);
+
+        if (
+            $name === 'iri' ||
+            $name === 'uri' ||
+            $name === 'iauthority' ||
+            $name === 'authority'
+        ) {
+            $method = 'get_' . $name;
+            $return = $this->$method();
+        }
+        elseif (array_key_exists($name, $props)) {
+            $return = $this->$name;
+        }
+        // host -> ihost
+        elseif (($prop = 'i' . $name) && array_key_exists($prop, $props)) {
+            $name = $prop;
+            $return = $this->$prop;
+        }
+        // ischeme -> scheme
+        elseif (($prop = substr($name, 1)) && array_key_exists($prop, $props)) {
+            $name = $prop;
+            $return = $this->$prop;
+        }
+        else {
+            trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
+            $return = null;
+        }
+
+        if ($return === null && isset($this->normalization[$this->scheme][$name])) {
+            return $this->normalization[$this->scheme][$name];
+        }
+        else {
+            return $return;
+        }
+    }
+
+    /**
+     * Overload __isset() to provide access via properties
+     *
+     * @param string $name Property name
+     * @return bool
+     */
+    public function __isset($name) {
+        return (method_exists($this, 'get_' . $name) || isset($this->$name));
+    }
+
+    /**
+     * Overload __unset() to provide access via properties
+     *
+     * @param string $name Property name
+     */
+    public function __unset($name) {
+        if (method_exists($this, 'set_' . $name)) {
+            call_user_func(array($this, 'set_' . $name), '');
+        }
+    }
+
+    /**
+     * Create a new IRI object, from a specified string
+     *
+     * @param string|null $iri
+     */
+    public function __construct($iri = null) {
+        $this->set_iri($iri);
+    }
+
+    /**
+     * Create a new IRI object by resolving a relative IRI
+     *
+     * Returns false if $base is not absolute, otherwise an IRI.
+     *
+     * @param IRI|string $base (Absolute) Base IRI
+     * @param IRI|string $relative Relative IRI
+     * @return IRI|false
+     */
+    public static function absolutize($base, $relative) {
+        if (!($relative instanceof Requests_IRI)) {
+            $relative = new Requests_IRI($relative);
+        }
+        if (!$relative->is_valid()) {
+            return false;
+        }
+        elseif ($relative->scheme !== null) {
+            return clone $relative;
+        }
+
+        if (!($base instanceof Requests_IRI)) {
+            $base = new Requests_IRI($base);
+        }
+        if ($base->scheme === null || !$base->is_valid()) {
+            return false;
+        }
+
+        if ($relative->get_iri() !== '') {
+            if ($relative->iuserinfo !== null || $relative->ihost !== null || $relative->port !== null) {
+                $target = clone $relative;
+                $target->scheme = $base->scheme;
+            }
+            else {
+                $target = new Requests_IRI;
+                $target->scheme = $base->scheme;
+                $target->iuserinfo = $base->iuserinfo;
+                $target->ihost = $base->ihost;
+                $target->port = $base->port;
+                if ($relative->ipath !== '') {
+                    if ($relative->ipath[0] === '/') {
+                        $target->ipath = $relative->ipath;
+                    }
+                    elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '') {
+                        $target->ipath = '/' . $relative->ipath;
+                    }
+                    elseif (($last_segment = strrpos($base->ipath, '/')) !== false) {
+                        $target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
+                    }
+                    else {
+                        $target->ipath = $relative->ipath;
+                    }
+                    $target->ipath = $target->remove_dot_segments($target->ipath);
+                    $target->iquery = $relative->iquery;
+                }
+                else {
+                    $target->ipath = $base->ipath;
+                    if ($relative->iquery !== null) {
+                        $target->iquery = $relative->iquery;
+                    }
+                    elseif ($base->iquery !== null) {
+                        $target->iquery = $base->iquery;
+                    }
+                }
+                $target->ifragment = $relative->ifragment;
+            }
+        }
+        else {
+            $target = clone $base;
+            $target->ifragment = null;
+        }
+        $target->scheme_normalization();
+        return $target;
+    }
+
+    /**
+     * Parse an IRI into scheme/authority/path/query/fragment segments
+     *
+     * @param string $iri
+     * @return array
+     */
+    protected function parse_iri($iri) {
+        $iri = trim($iri, "\x20\x09\x0A\x0C\x0D");
+        $has_match = preg_match('/^((?P<scheme>[^:\/?#]+):)?(\/\/(?P<authority>[^\/?#]*))?(?P<path>[^?#]*)(\?(?P<query>[^#]*))?(#(?P<fragment>.*))?$/', $iri, $match);
+        if (!$has_match) {
+            throw new Requests_Exception('Cannot parse supplied IRI', 'iri.cannot_parse', $iri);
+        }
+
+        if ($match[1] === '') {
+            $match['scheme'] = null;
+        }
+        if (!isset($match[3]) || $match[3] === '') {
+            $match['authority'] = null;
+        }
+        if (!isset($match[5])) {
+            $match['path'] = '';
+        }
+        if (!isset($match[6]) || $match[6] === '') {
+            $match['query'] = null;
+        }
+        if (!isset($match[8]) || $match[8] === '') {
+            $match['fragment'] = null;
+        }
+        return $match;
+    }
+
+    /**
+     * Remove dot segments from a path
+     *
+     * @param string $input
+     * @return string
+     */
+    protected function remove_dot_segments($input) {
+        $output = '';
+        while (strpos($input, './') !== false || strpos($input, '/.') !== false || $input === '.' || $input === '..') {
+            // A: If the input buffer begins with a prefix of "../" or "./",
+            // then remove that prefix from the input buffer; otherwise,
+            if (strpos($input, '../') === 0) {
+                $input = substr($input, 3);
+            }
+            elseif (strpos($input, './') === 0) {
+                $input = substr($input, 2);
+            }
+            // B: if the input buffer begins with a prefix of "/./" or "/.",
+            // where "." is a complete path segment, then replace that prefix
+            // with "/" in the input buffer; otherwise,
+            elseif (strpos($input, '/./') === 0) {
+                $input = substr($input, 2);
+            }
+            elseif ($input === '/.') {
+                $input = '/';
+            }
+            // C: if the input buffer begins with a prefix of "/../" or "/..",
+            // where ".." is a complete path segment, then replace that prefix
+            // with "/" in the input buffer and remove the last segment and its
+            // preceding "/" (if any) from the output buffer; otherwise,
+            elseif (strpos($input, '/../') === 0) {
+                $input = substr($input, 3);
+                $output = substr_replace($output, '', strrpos($output, '/'));
+            }
+            elseif ($input === '/..') {
+                $input = '/';
+                $output = substr_replace($output, '', strrpos($output, '/'));
+            }
+            // D: if the input buffer consists only of "." or "..", then remove
+            // that from the input buffer; otherwise,
+            elseif ($input === '.' || $input === '..') {
+                $input = '';
+            }
+            // E: move the first path segment in the input buffer to the end of
+            // the output buffer, including the initial "/" character (if any)
+            // and any subsequent characters up to, but not including, the next
+            // "/" character or the end of the input buffer
+            elseif (($pos = strpos($input, '/', 1)) !== false) {
+                $output .= substr($input, 0, $pos);
+                $input = substr_replace($input, '', 0, $pos);
+            }
+            else {
+                $output .= $input;
+                $input = '';
+            }
+        }
+        return $output . $input;
+    }
+
+    /**
+     * Replace invalid character with percent encoding
+     *
+     * @param string $string Input string
+     * @param string $extra_chars Valid characters not in iunreserved or
+     *                            iprivate (this is ASCII-only)
+     * @param bool $iprivate Allow iprivate
+     * @return string
+     */
+    protected function replace_invalid_with_pct_encoding($string, $extra_chars, $iprivate = false) {
+        // Normalize as many pct-encoded sections as possible
+        $string = preg_replace_callback('/(?:%[A-Fa-f0-9]{2})+/', array(&$this, 'remove_iunreserved_percent_encoded'), $string);
+
+        // Replace invalid percent characters
+        $string = preg_replace('/%(?![A-Fa-f0-9]{2})/', '%25', $string);
+
+        // Add unreserved and % to $extra_chars (the latter is safe because all
+        // pct-encoded sections are now valid).
+        $extra_chars .= 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~%';
+
+        // Now replace any bytes that aren't allowed with their pct-encoded versions
+        $position = 0;
+        $strlen = strlen($string);
+        while (($position += strspn($string, $extra_chars, $position)) < $strlen) {
+            $value = ord($string[$position]);
+
+            // Start position
+            $start = $position;
+
+            // By default we are valid
+            $valid = true;
+
+            // No one byte sequences are valid due to the while.
+            // Two byte sequence:
+            if (($value & 0xE0) === 0xC0) {
+                $character = ($value & 0x1F) << 6;
+                $length = 2;
+                $remaining = 1;
+            }
+            // Three byte sequence:
+            elseif (($value & 0xF0) === 0xE0) {
+                $character = ($value & 0x0F) << 12;
+                $length = 3;
+                $remaining = 2;
+            }
+            // Four byte sequence:
+            elseif (($value & 0xF8) === 0xF0) {
+                $character = ($value & 0x07) << 18;
+                $length = 4;
+                $remaining = 3;
+            }
+            // Invalid byte:
+            else {
+                $valid = false;
+                $length = 1;
+                $remaining = 0;
+            }
+
+            if ($remaining) {
+                if ($position + $length <= $strlen) {
+                    for ($position++; $remaining; $position++) {
+                        $value = ord($string[$position]);
+
+                        // Check that the byte is valid, then add it to the character:
+                        if (($value & 0xC0) === 0x80) {
+                            $character |= ($value & 0x3F) << (--$remaining * 6);
+                        }
+                        // If it is invalid, count the sequence as invalid and reprocess the current byte:
+                        else {
+                            $valid = false;
+                            $position--;
+                            break;
+                        }
+                    }
+                }
+                else {
+                    $position = $strlen - 1;
+                    $valid = false;
+                }
+            }
+
+            // Percent encode anything invalid or not in ucschar
+            if (
+                // Invalid sequences
+                !$valid
+                // Non-shortest form sequences are invalid
+                || $length > 1 && $character <= 0x7F
+                || $length > 2 && $character <= 0x7FF
+                || $length > 3 && $character <= 0xFFFF
+                // Outside of range of ucschar codepoints
+                // Noncharacters
+                || ($character & 0xFFFE) === 0xFFFE
+                || $character >= 0xFDD0 && $character <= 0xFDEF
+                || (
+                    // Everything else not in ucschar
+                        $character > 0xD7FF && $character < 0xF900
+                    || $character < 0xA0
+                    || $character > 0xEFFFD
+                )
+                && (
+                    // Everything not in iprivate, if it applies
+                        !$iprivate
+                    || $character < 0xE000
+                    || $character > 0x10FFFD
+                )
+            ) {
+                // If we were a character, pretend we weren't, but rather an error.
+                if ($valid) {
+                    $position--;
+                }
+
+                for ($j = $start; $j <= $position; $j++) {
+                    $string = substr_replace($string, sprintf('%%%02X', ord($string[$j])), $j, 1);
+                    $j += 2;
+                    $position += 2;
+                    $strlen += 2;
+                }
+            }
+        }
+
+        return $string;
+    }
+
+    /**
+     * Callback function for preg_replace_callback.
+     *
+     * Removes sequences of percent encoded bytes that represent UTF-8
+     * encoded characters in iunreserved
+     *
+     * @param array $match PCRE match
+     * @return string Replacement
+     */
+    protected function remove_iunreserved_percent_encoded($match) {
+        // As we just have valid percent encoded sequences we can just explode
+        // and ignore the first member of the returned array (an empty string).
+        $bytes = explode('%', $match[0]);
+
+        // Initialize the new string (this is what will be returned) and that
+        // there are no bytes remaining in the current sequence (unsurprising
+        // at the first byte!).
+        $string = '';
+        $remaining = 0;
+
+        // Loop over each and every byte, and set $value to its value
+        for ($i = 1, $len = count($bytes); $i < $len; $i++) {
+            $value = hexdec($bytes[$i]);
+
+            // If we're the first byte of sequence:
+            if (!$remaining) {
+                // Start position
+                $start = $i;
+
+                // By default we are valid
+                $valid = true;
+
+                // One byte sequence:
+                if ($value <= 0x7F) {
+                    $character = $value;
+                    $length = 1;
+                }
+                // Two byte sequence:
+                elseif (($value & 0xE0) === 0xC0) {
+                    $character = ($value & 0x1F) << 6;
+                    $length = 2;
+                    $remaining = 1;
+                }
+                // Three byte sequence:
+                elseif (($value & 0xF0) === 0xE0) {
+                    $character = ($value & 0x0F) << 12;
+                    $length = 3;
+                    $remaining = 2;
+                }
+                // Four byte sequence:
+                elseif (($value & 0xF8) === 0xF0) {
+                    $character = ($value & 0x07) << 18;
+                    $length = 4;
+                    $remaining = 3;
+                }
+                // Invalid byte:
+                else {
+                    $valid = false;
+                    $remaining = 0;
+                }
+            }
+            // Continuation byte:
+            else {
+                // Check that the byte is valid, then add it to the character:
+                if (($value & 0xC0) === 0x80) {
+                    $remaining--;
+                    $character |= ($value & 0x3F) << ($remaining * 6);
+                }
+                // If it is invalid, count the sequence as invalid and reprocess the current byte as the start of a sequence:
+                else {
+                    $valid = false;
+                    $remaining = 0;
+                    $i--;
+                }
+            }
+
+            // If we've reached the end of the current byte sequence, append it to Unicode::$data
+            if (!$remaining) {
+                // Percent encode anything invalid or not in iunreserved
+                if (
+                    // Invalid sequences
+                    !$valid
+                    // Non-shortest form sequences are invalid
+                    || $length > 1 && $character <= 0x7F
+                    || $length > 2 && $character <= 0x7FF
+                    || $length > 3 && $character <= 0xFFFF
+                    // Outside of range of iunreserved codepoints
+                    || $character < 0x2D
+                    || $character > 0xEFFFD
+                    // Noncharacters
+                    || ($character & 0xFFFE) === 0xFFFE
+                    || $character >= 0xFDD0 && $character <= 0xFDEF
+                    // Everything else not in iunreserved (this is all BMP)
+                    || $character === 0x2F
+                    || $character > 0x39 && $character < 0x41
+                    || $character > 0x5A && $character < 0x61
+                    || $character > 0x7A && $character < 0x7E
+                    || $character > 0x7E && $character < 0xA0
+                    || $character > 0xD7FF && $character < 0xF900
+                ) {
+                    for ($j = $start; $j <= $i; $j++) {
+                        $string .= '%' . strtoupper($bytes[$j]);
+                    }
+                }
+                else {
+                    for ($j = $start; $j <= $i; $j++) {
+                        $string .= chr(hexdec($bytes[$j]));
+                    }
+                }
+            }
+        }
+
+        // If we have any bytes left over they are invalid (i.e., we are
+        // mid-way through a multi-byte sequence)
+        if ($remaining) {
+            for ($j = $start; $j < $len; $j++) {
+                $string .= '%' . strtoupper($bytes[$j]);
+            }
+        }
+
+        return $string;
+    }
+
+    protected function scheme_normalization() {
+        if (isset($this->normalization[$this->scheme]['iuserinfo']) && $this->iuserinfo === $this->normalization[$this->scheme]['iuserinfo']) {
+            $this->iuserinfo = null;
+        }
+        if (isset($this->normalization[$this->scheme]['ihost']) && $this->ihost === $this->normalization[$this->scheme]['ihost']) {
+            $this->ihost = null;
+        }
+        if (isset($this->normalization[$this->scheme]['port']) && $this->port === $this->normalization[$this->scheme]['port']) {
+            $this->port = null;
+        }
+        if (isset($this->normalization[$this->scheme]['ipath']) && $this->ipath === $this->normalization[$this->scheme]['ipath']) {
+            $this->ipath = '';
+        }
+        if (isset($this->ihost) && empty($this->ipath)) {
+            $this->ipath = '/';
+        }
+        if (isset($this->normalization[$this->scheme]['iquery']) && $this->iquery === $this->normalization[$this->scheme]['iquery']) {
+            $this->iquery = null;
+        }
+        if (isset($this->normalization[$this->scheme]['ifragment']) && $this->ifragment === $this->normalization[$this->scheme]['ifragment']) {
+            $this->ifragment = null;
+        }
+    }
+
+    /**
+     * Check if the object represents a valid IRI. This needs to be done on each
+     * call as some things change depending on another part of the IRI.
+     *
+     * @return bool
+     */
+    public function is_valid() {
+        $isauthority = $this->iuserinfo !== null || $this->ihost !== null || $this->port !== null;
+        if ($this->ipath !== '' &&
+            (
+                $isauthority && $this->ipath[0] !== '/' ||
+                (
+                    $this->scheme === null &&
+                    !$isauthority &&
+                    strpos($this->ipath, ':') !== false &&
+                    (strpos($this->ipath, '/') === false ? true : strpos($this->ipath, ':') < strpos($this->ipath, '/'))
+                )
+            )
+        ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Set the entire IRI. Returns true on success, false on failure (if there
+     * are any invalid characters).
+     *
+     * @param string $iri
+     * @return bool
+     */
+    protected function set_iri($iri) {
+        static $cache;
+        if (!$cache) {
+            $cache = array();
+        }
+
+        if ($iri === null) {
+            return true;
+        }
+        if (isset($cache[$iri])) {
+            list($this->scheme,
+                    $this->iuserinfo,
+                    $this->ihost,
+                    $this->port,
+                    $this->ipath,
+                    $this->iquery,
+                    $this->ifragment,
+                    $return) = $cache[$iri];
+            return $return;
+        }
+
+        $parsed = $this->parse_iri((string) $iri);
+
+        $return = $this->set_scheme($parsed['scheme'])
+            && $this->set_authority($parsed['authority'])
+            && $this->set_path($parsed['path'])
+            && $this->set_query($parsed['query'])
+            && $this->set_fragment($parsed['fragment']);
+
+        $cache[$iri] = array($this->scheme,
+                                $this->iuserinfo,
+                                $this->ihost,
+                                $this->port,
+                                $this->ipath,
+                                $this->iquery,
+                                $this->ifragment,
+                                $return);
+        return $return;
+    }
+
+    /**
+     * Set the scheme. Returns true on success, false on failure (if there are
+     * any invalid characters).
+     *
+     * @param string $scheme
+     * @return bool
+     */
+    protected function set_scheme($scheme) {
+        if ($scheme === null) {
+            $this->scheme = null;
+        }
+        elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme)) {
+            $this->scheme = null;
+            return false;
+        }
+        else {
+            $this->scheme = strtolower($scheme);
+        }
+        return true;
+    }
+
+    /**
+     * Set the authority. Returns true on success, false on failure (if there are
+     * any invalid characters).
+     *
+     * @param string $authority
+     * @return bool
+     */
+    protected function set_authority($authority) {
+        static $cache;
+        if (!$cache) {
+            $cache = array();
+        }
+
+        if ($authority === null) {
+            $this->iuserinfo = null;
+            $this->ihost = null;
+            $this->port = null;
+            return true;
+        }
+        if (isset($cache[$authority])) {
+            list($this->iuserinfo,
+                    $this->ihost,
+                    $this->port,
+                    $return) = $cache[$authority];
+
+            return $return;
+        }
+
+        $remaining = $authority;
+        if (($iuserinfo_end = strrpos($remaining, '@')) !== false) {
+            $iuserinfo = substr($remaining, 0, $iuserinfo_end);
+            $remaining = substr($remaining, $iuserinfo_end + 1);
+        }
+        else {
+            $iuserinfo = null;
+        }
+        if (($port_start = strpos($remaining, ':', strpos($remaining, ']'))) !== false) {
+            $port = substr($remaining, $port_start + 1);
+            if ($port === false || $port === '') {
+                $port = null;
+            }
+            $remaining = substr($remaining, 0, $port_start);
+        }
+        else {
+            $port = null;
+        }
+
+        $return = $this->set_userinfo($iuserinfo) &&
+                  $this->set_host($remaining) &&
+                  $this->set_port($port);
+
+        $cache[$authority] = array($this->iuserinfo,
+                                    $this->ihost,
+                                    $this->port,
+                                    $return);
+
+        return $return;
+    }
+
+    /**
+     * Set the iuserinfo.
+     *
+     * @param string $iuserinfo
+     * @return bool
+     */
+    protected function set_userinfo($iuserinfo) {
+        if ($iuserinfo === null) {
+            $this->iuserinfo = null;
+        }
+        else {
+            $this->iuserinfo = $this->replace_invalid_with_pct_encoding($iuserinfo, '!$&\'()*+,;=:');
+            $this->scheme_normalization();
+        }
+
+        return true;
+    }
+
+    /**
+     * Set the ihost. Returns true on success, false on failure (if there are
+     * any invalid characters).
+     *
+     * @param string $ihost
+     * @return bool
+     */
+    protected function set_host($ihost) {
+        if ($ihost === null) {
+            $this->ihost = null;
+            return true;
+        }
+        if (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']') {
+            if (Requests_IPv6::check_ipv6(substr($ihost, 1, -1))) {
+                $this->ihost = '[' . Requests_IPv6::compress(substr($ihost, 1, -1)) . ']';
+            }
+            else {
+                $this->ihost = null;
+                return false;
+            }
+        }
+        else {
+            $ihost = $this->replace_invalid_with_pct_encoding($ihost, '!$&\'()*+,;=');
+
+            // Lowercase, but ignore pct-encoded sections (as they should
+            // remain uppercase). This must be done after the previous step
+            // as that can add unescaped characters.
+            $position = 0;
+            $strlen = strlen($ihost);
+            while (($position += strcspn($ihost, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ%', $position)) < $strlen) {
+                if ($ihost[$position] === '%') {
+                    $position += 3;
+                }
+                else {
+                    $ihost[$position] = strtolower($ihost[$position]);
+                    $position++;
+                }
+            }
+
+            $this->ihost = $ihost;
+        }
+
+        $this->scheme_normalization();
+
+        return true;
+    }
+
+    /**
+     * Set the port. Returns true on success, false on failure (if there are
+     * any invalid characters).
+     *
+     * @param string $port
+     * @return bool
+     */
+    protected function set_port($port) {
+        if ($port === null) {
+            $this->port = null;
+            return true;
+        }
+
+        if (strspn($port, '0123456789') === strlen($port)) {
+            $this->port = (int) $port;
+            $this->scheme_normalization();
+            return true;
+        }
+
+        $this->port = null;
+        return false;
+    }
+
+    /**
+     * Set the ipath.
+     *
+     * @param string $ipath
+     * @return bool
+     */
+    protected function set_path($ipath) {
+        static $cache;
+        if (!$cache) {
+            $cache = array();
+        }
+
+        $ipath = (string) $ipath;
+
+        if (isset($cache[$ipath])) {
+            $this->ipath = $cache[$ipath][(int) ($this->scheme !== null)];
+        }
+        else {
+            $valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/');
+            $removed = $this->remove_dot_segments($valid);
+
+            $cache[$ipath] = array($valid, $removed);
+            $this->ipath = ($this->scheme !== null) ? $removed : $valid;
+        }
+        $this->scheme_normalization();
+        return true;
+    }
+
+    /**
+     * Set the iquery.
+     *
+     * @param string $iquery
+     * @return bool
+     */
+    protected function set_query($iquery) {
+        if ($iquery === null) {
+            $this->iquery = null;
+        }
+        else {
+            $this->iquery = $this->replace_invalid_with_pct_encoding($iquery, '!$&\'()*+,;=:@/?', true);
+            $this->scheme_normalization();
+        }
+        return true;
+    }
+
+    /**
+     * Set the ifragment.
+     *
+     * @param string $ifragment
+     * @return bool
+     */
+    protected function set_fragment($ifragment) {
+        if ($ifragment === null) {
+            $this->ifragment = null;
+        }
+        else {
+            $this->ifragment = $this->replace_invalid_with_pct_encoding($ifragment, '!$&\'()*+,;=:@/?');
+            $this->scheme_normalization();
+        }
+        return true;
+    }
+
+    /**
+     * Convert an IRI to a URI (or parts thereof)
+     *
+     * @param string|bool IRI to convert (or false from {@see get_iri})
+     * @return string|false URI if IRI is valid, false otherwise.
+     */
+    protected function to_uri($string) {
+        if (!is_string($string)) {
+            return false;
+        }
+
+        static $non_ascii;
+        if (!$non_ascii) {
+            $non_ascii = implode('', range("\x80", "\xFF"));
+        }
+
+        $position = 0;
+        $strlen = strlen($string);
+        while (($position += strcspn($string, $non_ascii, $position)) < $strlen) {
+            $string = substr_replace($string, sprintf('%%%02X', ord($string[$position])), $position, 1);
+            $position += 3;
+            $strlen += 2;
+        }
+
+        return $string;
+    }
+
+    /**
+     * Get the complete IRI
+     *
+     * @return string
+     */
+    protected function get_iri() {
+        if (!$this->is_valid()) {
+            return false;
+        }
+
+        $iri = '';
+        if ($this->scheme !== null) {
+            $iri .= $this->scheme . ':';
+        }
+        if (($iauthority = $this->get_iauthority()) !== null) {
+            $iri .= '//' . $iauthority;
+        }
+        $iri .= $this->ipath;
+        if ($this->iquery !== null) {
+            $iri .= '?' . $this->iquery;
+        }
+        if ($this->ifragment !== null) {
+            $iri .= '#' . $this->ifragment;
+        }
+
+        return $iri;
+    }
+
+    /**
+     * Get the complete URI
+     *
+     * @return string
+     */
+    protected function get_uri() {
+        return $this->to_uri($this->get_iri());
+    }
+
+    /**
+     * Get the complete iauthority
+     *
+     * @return string
+     */
+    protected function get_iauthority() {
+        if ($this->iuserinfo === null && $this->ihost === null && $this->port === null) {
+            return null;
+        }
+
+        $iauthority = '';
+        if ($this->iuserinfo !== null) {
+            $iauthority .= $this->iuserinfo . '@';
+        }
+        if ($this->ihost !== null) {
+            $iauthority .= $this->ihost;
+        }
+        if ($this->port !== null) {
+            $iauthority .= ':' . $this->port;
+        }
+        return $iauthority;
+    }
+
+    /**
+     * Get the complete authority
+     *
+     * @return string
+     */
+    protected function get_authority() {
+        $iauthority = $this->get_iauthority();
+        if (is_string($iauthority)) {
+            return $this->to_uri($iauthority);
+        }
+        else {
+            return $iauthority;
+        }
+    }
 }

plugin/buycourses/src/Requests/IPv6.php

Indentation +159 added lines, -159 removed lines

@@ -16,175 +16,175 @@
  * @subpackage Utilities
  */
 class Requests_IPv6 {
-	/**
-	 * Uncompresses an IPv6 address
-	 *
-	 * RFC 4291 allows you to compress consecutive zero pieces in an address to
-	 * '::'. This method expects a valid IPv6 address and expands the '::' to
-	 * the required number of zero pieces.
-	 *
-	 * Example:  FF01::101   ->  FF01:0:0:0:0:0:0:101
-	 *           ::1         ->  0:0:0:0:0:0:0:1
-	 *
-	 * @author Alexander Merz <alexander.merz@web.de>
-	 * @author elfrink at introweb dot nl
-	 * @author Josh Peck <jmp at joshpeck dot org>
-	 * @copyright 2003-2005 The PHP Group
-	 * @license http://www.opensource.org/licenses/bsd-license.php
-	 * @param string $ip An IPv6 address
-	 * @return string The uncompressed IPv6 address
-	 */
-	public static function uncompress($ip) {
-		if (substr_count($ip, '::') !== 1) {
-			return $ip;
-		}
+    /**
+     * Uncompresses an IPv6 address
+     *
+     * RFC 4291 allows you to compress consecutive zero pieces in an address to
+     * '::'. This method expects a valid IPv6 address and expands the '::' to
+     * the required number of zero pieces.
+     *
+     * Example:  FF01::101   ->  FF01:0:0:0:0:0:0:101
+     *           ::1         ->  0:0:0:0:0:0:0:1
+     *
+     * @author Alexander Merz <alexander.merz@web.de>
+     * @author elfrink at introweb dot nl
+     * @author Josh Peck <jmp at joshpeck dot org>
+     * @copyright 2003-2005 The PHP Group
+     * @license http://www.opensource.org/licenses/bsd-license.php
+     * @param string $ip An IPv6 address
+     * @return string The uncompressed IPv6 address
+     */
+    public static function uncompress($ip) {
+        if (substr_count($ip, '::') !== 1) {
+            return $ip;
+        }
 
-		list($ip1, $ip2) = explode('::', $ip);
-		$c1 = ($ip1 === '') ? -1 : substr_count($ip1, ':');
-		$c2 = ($ip2 === '') ? -1 : substr_count($ip2, ':');
+        list($ip1, $ip2) = explode('::', $ip);
+        $c1 = ($ip1 === '') ? -1 : substr_count($ip1, ':');
+        $c2 = ($ip2 === '') ? -1 : substr_count($ip2, ':');
 
-		if (strpos($ip2, '.') !== false) {
-			$c2++;
-		}
-		// ::
-		if ($c1 === -1 && $c2 === -1) {
-			$ip = '0:0:0:0:0:0:0:0';
-		}
-		// ::xxx
-		else if ($c1 === -1) {
-			$fill = str_repeat('0:', 7 - $c2);
-			$ip = str_replace('::', $fill, $ip);
-		}
-		// xxx::
-		else if ($c2 === -1) {
-			$fill = str_repeat(':0', 7 - $c1);
-			$ip = str_replace('::', $fill, $ip);
-		}
-		// xxx::xxx
-		else {
-			$fill = ':' . str_repeat('0:', 6 - $c2 - $c1);
-			$ip = str_replace('::', $fill, $ip);
-		}
-		return $ip;
-	}
+        if (strpos($ip2, '.') !== false) {
+            $c2++;
+        }
+        // ::
+        if ($c1 === -1 && $c2 === -1) {
+            $ip = '0:0:0:0:0:0:0:0';
+        }
+        // ::xxx
+        else if ($c1 === -1) {
+            $fill = str_repeat('0:', 7 - $c2);
+            $ip = str_replace('::', $fill, $ip);
+        }
+        // xxx::
+        else if ($c2 === -1) {
+            $fill = str_repeat(':0', 7 - $c1);
+            $ip = str_replace('::', $fill, $ip);
+        }
+        // xxx::xxx
+        else {
+            $fill = ':' . str_repeat('0:', 6 - $c2 - $c1);
+            $ip = str_replace('::', $fill, $ip);
+        }
+        return $ip;
+    }
 
-	/**
-	 * Compresses an IPv6 address
-	 *
-	 * RFC 4291 allows you to compress consecutive zero pieces in an address to
-	 * '::'. This method expects a valid IPv6 address and compresses consecutive
-	 * zero pieces to '::'.
-	 *
-	 * Example:  FF01:0:0:0:0:0:0:101   ->  FF01::101
-	 *           0:0:0:0:0:0:0:1        ->  ::1
-	 *
-	 * @see uncompress()
-	 * @param string $ip An IPv6 address
-	 * @return string The compressed IPv6 address
-	 */
-	public static function compress($ip) {
-		// Prepare the IP to be compressed
-		$ip = self::uncompress($ip);
-		$ip_parts = self::split_v6_v4($ip);
+    /**
+     * Compresses an IPv6 address
+     *
+     * RFC 4291 allows you to compress consecutive zero pieces in an address to
+     * '::'. This method expects a valid IPv6 address and compresses consecutive
+     * zero pieces to '::'.
+     *
+     * Example:  FF01:0:0:0:0:0:0:101   ->  FF01::101
+     *           0:0:0:0:0:0:0:1        ->  ::1
+     *
+     * @see uncompress()
+     * @param string $ip An IPv6 address
+     * @return string The compressed IPv6 address
+     */
+    public static function compress($ip) {
+        // Prepare the IP to be compressed
+        $ip = self::uncompress($ip);
+        $ip_parts = self::split_v6_v4($ip);
 
-		// Replace all leading zeros
-		$ip_parts[0] = preg_replace('/(^|:)0+([0-9])/', '\1\2', $ip_parts[0]);
+        // Replace all leading zeros
+        $ip_parts[0] = preg_replace('/(^|:)0+([0-9])/', '\1\2', $ip_parts[0]);
 
-		// Find bunches of zeros
-		if (preg_match_all('/(?:^|:)(?:0(?::|$))+/', $ip_parts[0], $matches, PREG_OFFSET_CAPTURE)) {
-			$max = 0;
-			$pos = null;
-			foreach ($matches[0] as $match) {
-				if (strlen($match[0]) > $max) {
-					$max = strlen($match[0]);
-					$pos = $match[1];
-				}
-			}
+        // Find bunches of zeros
+        if (preg_match_all('/(?:^|:)(?:0(?::|$))+/', $ip_parts[0], $matches, PREG_OFFSET_CAPTURE)) {
+            $max = 0;
+            $pos = null;
+            foreach ($matches[0] as $match) {
+                if (strlen($match[0]) > $max) {
+                    $max = strlen($match[0]);
+                    $pos = $match[1];
+                }
+            }
 
-			$ip_parts[0] = substr_replace($ip_parts[0], '::', $pos, $max);
-		}
+            $ip_parts[0] = substr_replace($ip_parts[0], '::', $pos, $max);
+        }
 
-		if ($ip_parts[1] !== '') {
-			return implode(':', $ip_parts);
-		}
-		else {
-			return $ip_parts[0];
-		}
-	}
+        if ($ip_parts[1] !== '') {
+            return implode(':', $ip_parts);
+        }
+        else {
+            return $ip_parts[0];
+        }
+    }
 
-	/**
-	 * Splits an IPv6 address into the IPv6 and IPv4 representation parts
-	 *
-	 * RFC 4291 allows you to represent the last two parts of an IPv6 address
-	 * using the standard IPv4 representation
-	 *
-	 * Example:  0:0:0:0:0:0:13.1.68.3
-	 *           0:0:0:0:0:FFFF:129.144.52.38
-	 *
-	 * @param string $ip An IPv6 address
-	 * @return string[] [0] contains the IPv6 represented part, and [1] the IPv4 represented part
-	 */
-	protected static function split_v6_v4($ip) {
-		if (strpos($ip, '.') !== false) {
-			$pos = strrpos($ip, ':');
-			$ipv6_part = substr($ip, 0, $pos);
-			$ipv4_part = substr($ip, $pos + 1);
-			return array($ipv6_part, $ipv4_part);
-		}
-		else {
-			return array($ip, '');
-		}
-	}
+    /**
+     * Splits an IPv6 address into the IPv6 and IPv4 representation parts
+     *
+     * RFC 4291 allows you to represent the last two parts of an IPv6 address
+     * using the standard IPv4 representation
+     *
+     * Example:  0:0:0:0:0:0:13.1.68.3
+     *           0:0:0:0:0:FFFF:129.144.52.38
+     *
+     * @param string $ip An IPv6 address
+     * @return string[] [0] contains the IPv6 represented part, and [1] the IPv4 represented part
+     */
+    protected static function split_v6_v4($ip) {
+        if (strpos($ip, '.') !== false) {
+            $pos = strrpos($ip, ':');
+            $ipv6_part = substr($ip, 0, $pos);
+            $ipv4_part = substr($ip, $pos + 1);
+            return array($ipv6_part, $ipv4_part);
+        }
+        else {
+            return array($ip, '');
+        }
+    }
 
-	/**
-	 * Checks an IPv6 address
-	 *
-	 * Checks if the given IP is a valid IPv6 address
-	 *
-	 * @param string $ip An IPv6 address
-	 * @return bool true if $ip is a valid IPv6 address
-	 */
-	public static function check_ipv6($ip) {
-		$ip = self::uncompress($ip);
-		list($ipv6, $ipv4) = self::split_v6_v4($ip);
-		$ipv6 = explode(':', $ipv6);
-		$ipv4 = explode('.', $ipv4);
-		if (count($ipv6) === 8 && count($ipv4) === 1 || count($ipv6) === 6 && count($ipv4) === 4) {
-			foreach ($ipv6 as $ipv6_part) {
-				// The section can't be empty
-				if ($ipv6_part === '') {
-					return false;
-				}
+    /**
+     * Checks an IPv6 address
+     *
+     * Checks if the given IP is a valid IPv6 address
+     *
+     * @param string $ip An IPv6 address
+     * @return bool true if $ip is a valid IPv6 address
+     */
+    public static function check_ipv6($ip) {
+        $ip = self::uncompress($ip);
+        list($ipv6, $ipv4) = self::split_v6_v4($ip);
+        $ipv6 = explode(':', $ipv6);
+        $ipv4 = explode('.', $ipv4);
+        if (count($ipv6) === 8 && count($ipv4) === 1 || count($ipv6) === 6 && count($ipv4) === 4) {
+            foreach ($ipv6 as $ipv6_part) {
+                // The section can't be empty
+                if ($ipv6_part === '') {
+                    return false;
+                }
 
-				// Nor can it be over four characters
-				if (strlen($ipv6_part) > 4) {
-					return false;
-				}
+                // Nor can it be over four characters
+                if (strlen($ipv6_part) > 4) {
+                    return false;
+                }
 
-				// Remove leading zeros (this is safe because of the above)
-				$ipv6_part = ltrim($ipv6_part, '0');
-				if ($ipv6_part === '') {
-					$ipv6_part = '0';
-				}
+                // Remove leading zeros (this is safe because of the above)
+                $ipv6_part = ltrim($ipv6_part, '0');
+                if ($ipv6_part === '') {
+                    $ipv6_part = '0';
+                }
 
-				// Check the value is valid
-				$value = hexdec($ipv6_part);
-				if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF) {
-					return false;
-				}
-			}
-			if (count($ipv4) === 4) {
-				foreach ($ipv4 as $ipv4_part) {
-					$value = (int) $ipv4_part;
-					if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF) {
-						return false;
-					}
-				}
-			}
-			return true;
-		}
-		else {
-			return false;
-		}
-	}
+                // Check the value is valid
+                $value = hexdec($ipv6_part);
+                if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF) {
+                    return false;
+                }
+            }
+            if (count($ipv4) === 4) {
+                foreach ($ipv4 as $ipv4_part) {
+                    $value = (int) $ipv4_part;
+                    if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
 }

plugin/buycourses/src/Requests/Proxy.php

Indentation +11 added lines, -11 removed lines

@@ -21,15 +21,15 @@
  * @since 1.6
  */
 interface Requests_Proxy {
-	/**
-	 * Register hooks as needed
-	 *
-	 * This method is called in {@see Requests::request} when the user has set
-	 * an instance as the 'auth' option. Use this callback to register all the
-	 * hooks you'll need.
-	 *
-	 * @see Requests_Hooks::register
-	 * @param Requests_Hooks $hooks Hook system
-	 */
-	public function register(Requests_Hooks &$hooks);
+    /**
+     * Register hooks as needed
+     *
+     * This method is called in {@see Requests::request} when the user has set
+     * an instance as the 'auth' option. Use this callback to register all the
+     * hooks you'll need.
+     *
+     * @see Requests_Hooks::register
+     * @param Requests_Hooks $hooks Hook system
+     */
+    public function register(Requests_Hooks &$hooks);
 }
\ No newline at end of file

plugin/buycourses/src/Requests/Exception.php

Indentation +43 added lines, -43 removed lines

@@ -11,52 +11,52 @@
  * @package Requests
  */
 class Requests_Exception extends Exception {
-	/**
-	 * Type of exception
-	 *
-	 * @var string
-	 */
-	protected $type;
+    /**
+     * Type of exception
+     *
+     * @var string
+     */
+    protected $type;
 
-	/**
-	 * Data associated with the exception
-	 *
-	 * @var mixed
-	 */
-	protected $data;
+    /**
+     * Data associated with the exception
+     *
+     * @var mixed
+     */
+    protected $data;
 
-	/**
-	 * Create a new exception
-	 *
-	 * @param string $message Exception message
-	 * @param string $type Exception type
-	 * @param mixed $data Associated data
-	 * @param integer $code Exception numerical code, if applicable
-	 */
-	public function __construct($message, $type, $data = null, $code = 0) {
-		parent::__construct($message, $code);
+    /**
+     * Create a new exception
+     *
+     * @param string $message Exception message
+     * @param string $type Exception type
+     * @param mixed $data Associated data
+     * @param integer $code Exception numerical code, if applicable
+     */
+    public function __construct($message, $type, $data = null, $code = 0) {
+        parent::__construct($message, $code);
 
-		$this->type = $type;
-		$this->data = $data;
-	}
+        $this->type = $type;
+        $this->data = $data;
+    }
 
-	/**
-	 * Like {@see getCode()}, but a string code.
-	 *
-	 * @codeCoverageIgnore
-	 * @return string
-	 */
-	public function getType() {
-		return $this->type;
-	}
+    /**
+     * Like {@see getCode()}, but a string code.
+     *
+     * @codeCoverageIgnore
+     * @return string
+     */
+    public function getType() {
+        return $this->type;
+    }
 
-	/**
-	 * Gives any relevant data
-	 *
-	 * @codeCoverageIgnore
-	 * @return mixed
-	 */
-	public function getData() {
-		return $this->data;
-	}
+    /**
+     * Gives any relevant data
+     *
+     * @codeCoverageIgnore
+     * @return mixed
+     */
+    public function getData() {
+        return $this->data;
+    }
 }
\ No newline at end of file