ggoffy / wggithub

class/Github/Sanity.php

Indentation +14 added lines, -14 removed lines

@@ -8,21 +8,21 @@
  */
 abstract class Sanity
 {
-	/**
-	 * @throws LogicException
-	 */
-	public function & __get($name)
-	{
-		throw new LogicException('Cannot read an undeclared property ' . get_class($this) . "::\$$name.");
-	}
+    /**
+     * @throws LogicException
+     */
+    public function & __get($name)
+    {
+        throw new LogicException('Cannot read an undeclared property ' . get_class($this) . "::\$$name.");
+    }
 
 
-	/**
-	 * @throws LogicException
-	 */
-	public function __set($name, $value)
-	{
-		throw new LogicException('Cannot write to an undeclared property ' . get_class($this) . "::\$$name.");
-	}
+    /**
+     * @throws LogicException
+     */
+    public function __set($name, $value)
+    {
+        throw new LogicException('Cannot write to an undeclared property ' . get_class($this) . "::\$$name.");
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 	 */
 	public function & __get($name)
 	{
-		throw new LogicException('Cannot read an undeclared property ' . get_class($this) . "::\$$name.");
+		throw new LogicException('Cannot read an undeclared property '.get_class($this)."::\$$name.");
 	}
 
 
@@ -22,7 +22,7 @@ 
 	 */
 	public function __set($name, $value)
 	{
-		throw new LogicException('Cannot write to an undeclared property ' . get_class($this) . "::\$$name.");
+		throw new LogicException('Cannot write to an undeclared property '.get_class($this)."::\$$name.");
 	}
 
 }

class/Github/Api.php

Indentation +590 added lines, -590 removed lines

@@ -12,595 +12,595 @@
  */
 class Api extends Sanity
 {
-	/** @var string */
-	private $url = 'https://api.github.com';
-
-	/** @var string */
-	private $defaultAccept = 'application/vnd.github.v3+json';
-
-	/** @var array|NULL */
-	private $defaultParameters = [];
-
-	/** @var Http\IClient */
-	private $client;
-
-	/** @var OAuth\Token|NULL */
-	private $token;
-
-
-	public function __construct(Http\IClient $client = NULL)
-	{
-		$this->client = $client ?: Helpers::createDefaultClient();
-	}
-
-
-	/**
-	 * @return self
-	 */
-	public function setToken(OAuth\Token $token = NULL)
-	{
-		$this->token = $token;
-		return $this;
-	}
-
-
-	/**
-	 * @return OAuth\Token|NULL
-	 */
-	public function getToken()
-	{
-		return $this->token;
-	}
-
-
-	/**
-	 * @param  array
-	 * @return self
-	 */
-	public function setDefaultParameters(array $defaults = NULL)
-	{
-		$this->defaultParameters = $defaults ?: [];
-		return $this;
-	}
-
-
-	/**
-	 * @return array
-	 */
-	public function getDefaultParameters()
-	{
-		return $this->defaultParameters;
-	}
-
-
-	/**
-	 * @param  string
-	 * @return self
-	 */
-	public function setDefaultAccept($accept)
-	{
-		$this->defaultAccept = $accept;
-		return $this;
-	}
-
-
-	/**
-	 * @return string
-	 */
-	public function getDefaultAccept()
-	{
-		return $this->defaultAccept;
-	}
-
-
-	/**
-	 * @see createRequest()
-	 * @see request()
-	 *
-	 * @param  string
-	 * @return Http\Response
-	 *
-	 * @throws MissingParameterException
-	 */
-	public function delete($urlPath, array $parameters = [], array $headers = [])
-	{
-		return $this->request(
-			$this->createRequest(Http\Request::DELETE, $urlPath, $parameters, $headers)
-		);
-	}
-
-
-	/**
-	 * @see createRequest()
-	 * @see request()
-	 *
-	 * @param  string
-	 * @return Http\Response
-	 *
-	 * @throws MissingParameterException
-	 */
-	public function get($urlPath, array $parameters = [], array $headers = [])
-	{
-		return $this->request(
-			$this->createRequest(Http\Request::GET, $urlPath, $parameters, $headers)
-		);
-	}
-
-
-	/**
-	 * @see createRequest()
-	 * @see request()
-	 *
-	 * @param  string
-	 * @return Http\Response
-	 *
-	 * @throws MissingParameterException
-	 */
-	public function head($urlPath, array $parameters = [], array $headers = [])
-	{
-		return $this->request(
-			$this->createRequest(Http\Request::HEAD, $urlPath, $parameters, $headers)
-		);
-	}
-
-
-	/**
-	 * @see createRequest()
-	 * @see request()
-	 *
-	 * @param  string
-	 * @param  mixed
-	 * @return Http\Response
-	 *
-	 * @throws MissingParameterException
-	 * @throws JsonException
-	 */
-	public function patch($urlPath, $content, array $parameters = [], array $headers = [])
-	{
-		return $this->request(
-			$this->createRequest(Http\Request::PATCH, $urlPath, $parameters, $headers, $content)
-		);
-	}
-
-
-	/**
-	 * @see createRequest()
-	 * @see request()
-	 *
-	 * @param  string
-	 * @param  mixed
-	 * @return Http\Response
-	 *
-	 * @throws MissingParameterException
-	 * @throws JsonException
-	 */
-	public function post($urlPath, $content, array $parameters = [], array $headers = [])
-	{
-		return $this->request(
-			$this->createRequest(Http\Request::POST, $urlPath, $parameters, $headers, $content)
-		);
-	}
-
-
-	/**
-	 * @see createRequest()
-	 * @see request()
-	 *
-	 * @param  string
-	 * @param  mixed
-	 * @return Http\Response
-	 *
-	 * @throws MissingParameterException
-	 * @throws JsonException
-	 */
-	public function put($urlPath, $content = NULL, array $parameters = [], array $headers = [])
-	{
-		return $this->request(
-			$this->createRequest(Http\Request::PUT, $urlPath, $parameters, $headers, $content)
-		);
-	}
-
-
-	/**
-	 * @return Http\Response
-	 *
-	 * @throws Http\BadResponseException
-	 */
-	public function request(Http\Request $request)
-	{
-		$request = clone $request;
-
-		$request->addHeader('Accept', $this->defaultAccept);
-		$request->addHeader('Time-Zone', date_default_timezone_get());
-		$request->addHeader('User-Agent', 'milo/github-api');
-
-		if ($this->token) {
-			/** @todo Distinguish token type? */
-			$request->addHeader('Authorization', "token {$this->token->getValue()}");
-		}
-
-		return $this->client->request($request);
-	}
-
-
-	/**
-	 * @param  string  Http\Request::GET|POST|...
-	 * @param  string  path like '/users/:user/repos' where ':user' is substitution
-	 * @param  array[name => value]  replaces substitutions in $urlPath, the rest is appended as query string to URL
-	 * @param  array[name => value]  name is case-insensitive
-	 * @param  mixed|NULL  arrays and objects are encoded to JSON and Content-Type is set
-	 * @return Http\Request
-	 *
-	 * @throws MissingParameterException  when substitution is used in URL but parameter is missing
-	 * @throws JsonException  when encoding to JSON fails
-	 */
-	public function createRequest($method, $urlPath, array $parameters = [], array $headers = [], $content = NULL)
-	{
-		if (stripos($urlPath, $this->url) === 0) {  # Allows non-HTTPS URLs
-			$baseUrl = $this->url;
-			$urlPath = substr($urlPath, strlen($this->url));
-
-		} elseif (preg_match('#^(https://[^/]+)(/.*)?$#', $urlPath, $m)) {
-			$baseUrl = $m[1];
-			$urlPath = isset($m[2]) ? $m[2] : '';
-
-		} else {
-			$baseUrl = $this->url;
-		}
-
-		if (strpos($urlPath, '{') === FALSE) {
-			$urlPath = $this->expandColonParameters($urlPath, $parameters, $this->defaultParameters);
-		} else {
-			$urlPath = $this->expandUriTemplate($urlPath, $parameters, $this->defaultParameters);
-		}
-
-		$url = rtrim($baseUrl, '/') . '/' . ltrim($urlPath, '/');
-
-		if ($content !== NULL && (is_array($content) || is_object($content))) {
-			$headers['Content-Type'] = 'application/json; charset=utf-8';
-			$content = Helpers::jsonEncode($content);
-		}
-
-		return new Http\Request($method, $url, $headers, $content);
-	}
-
-
-	/**
-	 * @param  Http\Response
-	 * @param  array|NULL  these codes are treated as success; code < 300 if NULL
-	 * @return mixed
-	 *
-	 * @throws ApiException
-	 */
-	public function decode(Http\Response $response, array $okCodes = NULL)
-	{
-		$content = $response->getContent();
-		if (preg_match('~application/json~i', $response->getHeader('Content-Type', ''))) {
-			try {
-				$content = Helpers::jsonDecode($response->getContent(), true);
-			} catch (JsonException $e) {
-				throw new InvalidResponseException('JSON decoding failed.', 0, $e, $response);
-			}
-
-			if (!is_array($content) && !is_object($content)) {
-				throw new InvalidResponseException('Decoded JSON is not an array or object.', 0, NULL, $response);
-			}
-		}
-
-		$code = $response->getCode();
-		if (($okCodes === NULL && $code >= 300) || (is_array($okCodes) && !in_array($code, $okCodes))) {
-			/** @var $content \stdClass */
-			switch ($code) {
-				case Http\Response::S400_BAD_REQUEST:
-					throw new BadRequestException(self::errorMessage($content), $code, NULL, $response);
-
-				case Http\Response::S401_UNAUTHORIZED:
-					throw new UnauthorizedException(self::errorMessage($content), $code, NULL, $response);
-
-				case Http\Response::S403_FORBIDDEN:
-					if ($response->getHeader('X-RateLimit-Remaining') === '0') {
-						throw new RateLimitExceedException(self::errorMessage($content), $code, NULL, $response);
-					}
-					throw new ForbiddenException(self::errorMessage($content), $code, NULL, $response);
-
-				case Http\Response::S404_NOT_FOUND:
-					throw new NotFoundException('Resource not found or not authorized to access.', $code, NULL, $response);
-
-				case Http\Response::S422_UNPROCESSABLE_ENTITY:
-					throw new UnprocessableEntityException(self::errorMessage($content), $code, NULL, $response);
-			}
-
-			$message = $okCodes === NULL ? '< 300' : implode(' or ', $okCodes);
-			throw new UnexpectedResponseException("Expected response with code $message.", $code, NULL, $response);
-		}
-
-		return $content;
-	}
-
-
-	/**
-	 * Creates paginator for HTTP GET requests.
-	 *
-	 * @see get()
-	 *
-	 * @param  string
-	 * @return Paginator
-	 *
-	 * @throws MissingParameterException
-	 */
-	public function paginator($urlPath, array $parameters = [], array $headers = [])
-	{
-		return new Paginator(
-			$this,
-			$this->createRequest(Http\Request::GET, $urlPath, $parameters, $headers)
-		);
-	}
-
-
-	/**
-	 * @return Http\IClient
-	 */
-	public function getClient()
-	{
-		return $this->client;
-	}
-
-
-	/**
-	 * @param  string
-	 * @return Api
-	 */
-	public function withUrl($url)
-	{
-		$api = clone $this;
-		$api->setUrl($url);
-		return $api;
-	}
-
-
-	/**
-	 * @param  string
-	 * @return self
-	 */
-	public function setUrl($url)
-	{
-		$this->url = $url;
-		return $this;
-	}
-
-
-	/**
-	 * @return string
-	 */
-	public function getUrl()
-	{
-		return $this->url;
-	}
-
-
-	/**
-	 * @param  string
-	 * @return string
-	 *
-	 * @throws MissingParameterException
-	 */
-	protected function expandColonParameters($url, array $parameters, array $defaultParameters)
-	{
-		$parameters += $defaultParameters;
-
-		$url = preg_replace_callback('#(^|/|\.):([^/.]+)#', function($m) use ($url, & $parameters) {
-			if (!isset($parameters[$m[2]])) {
-				throw new MissingParameterException("Missing parameter '$m[2]' for URL path '$url'.");
-			}
-			$parameter = $parameters[$m[2]];
-			unset($parameters[$m[2]]);
-			return $m[1] . rawurlencode($parameter);
-		}, $url);
-
-		$url = rtrim($url, '/');
-
-		if (count($parameters)) {
-			$url .= '?' . http_build_query($parameters);
-		}
-
-		return $url;
-	}
-
-
-	/**
-	 * Expands URI template (RFC 6570).
-	 *
-	 * @see http://tools.ietf.org/html/rfc6570
-	 * @todo Inject remaining default parameters into query string?
-	 *
-	 * @param  string
-	 * @return string
-	 */
-	protected function expandUriTemplate($url, array $parameters, array $defaultParameters)
-	{
-		$parameters += $defaultParameters;
-
-		static $operatorFlags = [
-			''  => ['prefix' => '',  'separator' => ',', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => FALSE],
-			'+' => ['prefix' => '',  'separator' => ',', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => TRUE],
-			'#' => ['prefix' => '#', 'separator' => ',', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => TRUE],
-			'.' => ['prefix' => '.', 'separator' => '.', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => FALSE],
-			'/' => ['prefix' => '/', 'separator' => '/', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => FALSE],
-			';' => ['prefix' => ';', 'separator' => ';', 'named' => TRUE,  'ifEmpty' => '',  'reserved' => FALSE],
-			'?' => ['prefix' => '?', 'separator' => '&', 'named' => TRUE,  'ifEmpty' => '=', 'reserved' => FALSE],
-			'&' => ['prefix' => '&', 'separator' => '&', 'named' => TRUE,  'ifEmpty' => '=', 'reserved' => FALSE],
-		];
-
-		return preg_replace_callback('~{([+#./;?&])?([^}]+?)}~', function($m) use ($url, & $parameters, $operatorFlags) {
-			$flags = $operatorFlags[$m[1]];
-
-			$translated = [];
-			foreach (explode(',', $m[2]) as $name) {
-				$explode = FALSE;
-				$maxLength = NULL;
-				if (preg_match('~^(.+)(?:(\*)|:(\d+))$~', $name, $tmp)) { // TODO: Speed up?
-					$name = $tmp[1];
-					if (isset($tmp[3])) {
-						$maxLength = (int) $tmp[3];
-					} else {
-						$explode = TRUE;
-					}
-				}
-
-				if (!isset($parameters[$name])) {  // TODO: Throw exception?
-					continue;
-				}
-
-				$value = $parameters[$name];
-				if (is_scalar($value)) {
-					$translated[] = $this->prefix($flags, $name, $this->escape($flags, $value, $maxLength));
-
-				} else {
-					$value = (array) $value;
-					$isAssoc = key($value) !== 0;
-
-					// The '*' (explode) modifier
-					if ($explode) {
-						$parts = [];
-						if ($isAssoc) {
-							$this->walk($value, function ($v, $k) use (& $parts, $flags, $maxLength) {
-								$parts[] = $this->prefix(['named' => TRUE] + $flags, $k, $this->escape($flags, $v, $maxLength));
-							});
-
-						} elseif ($flags['named']) {
-							$this->walk($value, function ($v) use (& $parts, $flags, $name, $maxLength) {
-								$parts[] = $this->prefix($flags, $name, $this->escape($flags, $v, $maxLength));
-							});
-
-						} else {
-							$this->walk($value, function ($v) use (& $parts, $flags, $maxLength) {
-								$parts[] = $this->escape($flags, $v, $maxLength);
-							});
-						}
-
-						if (isset($parts[0])) {
-							if ($flags['named']) {
-								$translated[] = implode($flags['separator'], $parts);
-							} else {
-								$translated[] = $this->prefix($flags, $name, implode($flags['separator'], $parts));
-							}
-						}
-
-					} else {
-						$parts = [];
-						$this->walk($value, function($v, $k) use (& $parts, $isAssoc, $flags, $maxLength) {
-							if ($isAssoc) {
-								$parts[] = $this->escape($flags, $k);
-							}
-
-							$parts[] = $this->escape($flags, $v, $maxLength);
-						});
-
-						if (isset($parts[0])) {
-							$translated[] = $this->prefix($flags, $name, implode(',', $parts));
-						}
-					}
-				}
-			}
-
-			if (isset($translated[0])) {
-				return $flags['prefix'] . implode($flags['separator'], $translated);
-			}
-
-			return '';
-		}, $url);
-	}
-
-
-	/**
-	 * @param  array
-	 * @param  string
-	 * @param  string  already escaped
-	 * @return string
-	 */
-	private function prefix(array $flags, $name, $value)
-	{
-		$prefix = '';
-		if ($flags['named']) {
-			$prefix .= $this->escape($flags, $name);
-			if (isset($value[0])) {
-				$prefix .= '=';
-			} else {
-				$prefix .= $flags['ifEmpty'];
-			}
-		}
-
-		return $prefix . $value;
-	}
-
-
-	/**
-	 * @param  array
-	 * @param  mixed
-	 * @param  int|NULL
-	 * @return string
-	 */
-	private function escape(array $flags, $value, $maxLength = NULL)
-	{
-		$value = (string) $value;
-
-		if ($maxLength !== NULL) {
-			if (preg_match('~^(.{' . $maxLength . '}).~u', $value, $m)) {
-				$value = $m[1];
-			} elseif (strlen($value) > $maxLength) {  # when malformed UTF-8
-				$value = substr($value, 0, $maxLength);
-			}
-		}
-
-		if ($flags['reserved']) {
-			$parts = preg_split('~(%[0-9a-fA-F]{2}|[:/?#[\]@!$&\'()*+,;=])~', $value, -1, PREG_SPLIT_DELIM_CAPTURE);
-			$parts[] = '';
-
-			$escaped = '';
-			for ($i = 0, $count = count($parts); $i < $count; $i += 2) {
-				$escaped .= rawurlencode($parts[$i]) . $parts[$i + 1];
-			}
-
-			return $escaped;
-		}
-
-		return rawurlencode($value);
-	}
-
-
-	/**
-	 * @param  array
-	 * @param  callable
-	 */
-	private function walk(array $array, $cb)
-	{
-		foreach ($array as $k => $v) {
-			if ($v === NULL) {
-				continue;
-			}
-
-			$cb($v, $k);
-		}
-	}
-
-
-	/**
-	 * @param  \stdClass
-	 * @return string
-	 */
-	private static function errorMessage($content)
-	{
-		$message = isset($content->message)
-			? $content->message
-			: 'Unknown error';
-
-		if (isset($content->errors)) {
-			$message .= implode(', ', array_map(function($error) {
-				return '[' . implode(':', (array) $error) . ']';
-			}, $content->errors));
-		}
-
-		return $message;
-	}
+    /** @var string */
+    private $url = 'https://api.github.com';
+
+    /** @var string */
+    private $defaultAccept = 'application/vnd.github.v3+json';
+
+    /** @var array|NULL */
+    private $defaultParameters = [];
+
+    /** @var Http\IClient */
+    private $client;
+
+    /** @var OAuth\Token|NULL */
+    private $token;
+
+
+    public function __construct(Http\IClient $client = NULL)
+    {
+        $this->client = $client ?: Helpers::createDefaultClient();
+    }
+
+
+    /**
+     * @return self
+     */
+    public function setToken(OAuth\Token $token = NULL)
+    {
+        $this->token = $token;
+        return $this;
+    }
+
+
+    /**
+     * @return OAuth\Token|NULL
+     */
+    public function getToken()
+    {
+        return $this->token;
+    }
+
+
+    /**
+     * @param  array
+     * @return self
+     */
+    public function setDefaultParameters(array $defaults = NULL)
+    {
+        $this->defaultParameters = $defaults ?: [];
+        return $this;
+    }
+
+
+    /**
+     * @return array
+     */
+    public function getDefaultParameters()
+    {
+        return $this->defaultParameters;
+    }
+
+
+    /**
+     * @param  string
+     * @return self
+     */
+    public function setDefaultAccept($accept)
+    {
+        $this->defaultAccept = $accept;
+        return $this;
+    }
+
+
+    /**
+     * @return string
+     */
+    public function getDefaultAccept()
+    {
+        return $this->defaultAccept;
+    }
+
+
+    /**
+     * @see createRequest()
+     * @see request()
+     *
+     * @param  string
+     * @return Http\Response
+     *
+     * @throws MissingParameterException
+     */
+    public function delete($urlPath, array $parameters = [], array $headers = [])
+    {
+        return $this->request(
+            $this->createRequest(Http\Request::DELETE, $urlPath, $parameters, $headers)
+        );
+    }
+
+
+    /**
+     * @see createRequest()
+     * @see request()
+     *
+     * @param  string
+     * @return Http\Response
+     *
+     * @throws MissingParameterException
+     */
+    public function get($urlPath, array $parameters = [], array $headers = [])
+    {
+        return $this->request(
+            $this->createRequest(Http\Request::GET, $urlPath, $parameters, $headers)
+        );
+    }
+
+
+    /**
+     * @see createRequest()
+     * @see request()
+     *
+     * @param  string
+     * @return Http\Response
+     *
+     * @throws MissingParameterException
+     */
+    public function head($urlPath, array $parameters = [], array $headers = [])
+    {
+        return $this->request(
+            $this->createRequest(Http\Request::HEAD, $urlPath, $parameters, $headers)
+        );
+    }
+
+
+    /**
+     * @see createRequest()
+     * @see request()
+     *
+     * @param  string
+     * @param  mixed
+     * @return Http\Response
+     *
+     * @throws MissingParameterException
+     * @throws JsonException
+     */
+    public function patch($urlPath, $content, array $parameters = [], array $headers = [])
+    {
+        return $this->request(
+            $this->createRequest(Http\Request::PATCH, $urlPath, $parameters, $headers, $content)
+        );
+    }
+
+
+    /**
+     * @see createRequest()
+     * @see request()
+     *
+     * @param  string
+     * @param  mixed
+     * @return Http\Response
+     *
+     * @throws MissingParameterException
+     * @throws JsonException
+     */
+    public function post($urlPath, $content, array $parameters = [], array $headers = [])
+    {
+        return $this->request(
+            $this->createRequest(Http\Request::POST, $urlPath, $parameters, $headers, $content)
+        );
+    }
+
+
+    /**
+     * @see createRequest()
+     * @see request()
+     *
+     * @param  string
+     * @param  mixed
+     * @return Http\Response
+     *
+     * @throws MissingParameterException
+     * @throws JsonException
+     */
+    public function put($urlPath, $content = NULL, array $parameters = [], array $headers = [])
+    {
+        return $this->request(
+            $this->createRequest(Http\Request::PUT, $urlPath, $parameters, $headers, $content)
+        );
+    }
+
+
+    /**
+     * @return Http\Response
+     *
+     * @throws Http\BadResponseException
+     */
+    public function request(Http\Request $request)
+    {
+        $request = clone $request;
+
+        $request->addHeader('Accept', $this->defaultAccept);
+        $request->addHeader('Time-Zone', date_default_timezone_get());
+        $request->addHeader('User-Agent', 'milo/github-api');
+
+        if ($this->token) {
+            /** @todo Distinguish token type? */
+            $request->addHeader('Authorization', "token {$this->token->getValue()}");
+        }
+
+        return $this->client->request($request);
+    }
+
+
+    /**
+     * @param  string  Http\Request::GET|POST|...
+     * @param  string  path like '/users/:user/repos' where ':user' is substitution
+     * @param  array[name => value]  replaces substitutions in $urlPath, the rest is appended as query string to URL
+     * @param  array[name => value]  name is case-insensitive
+     * @param  mixed|NULL  arrays and objects are encoded to JSON and Content-Type is set
+     * @return Http\Request
+     *
+     * @throws MissingParameterException  when substitution is used in URL but parameter is missing
+     * @throws JsonException  when encoding to JSON fails
+     */
+    public function createRequest($method, $urlPath, array $parameters = [], array $headers = [], $content = NULL)
+    {
+        if (stripos($urlPath, $this->url) === 0) {  # Allows non-HTTPS URLs
+            $baseUrl = $this->url;
+            $urlPath = substr($urlPath, strlen($this->url));
+
+        } elseif (preg_match('#^(https://[^/]+)(/.*)?$#', $urlPath, $m)) {
+            $baseUrl = $m[1];
+            $urlPath = isset($m[2]) ? $m[2] : '';
+
+        } else {
+            $baseUrl = $this->url;
+        }
+
+        if (strpos($urlPath, '{') === FALSE) {
+            $urlPath = $this->expandColonParameters($urlPath, $parameters, $this->defaultParameters);
+        } else {
+            $urlPath = $this->expandUriTemplate($urlPath, $parameters, $this->defaultParameters);
+        }
+
+        $url = rtrim($baseUrl, '/') . '/' . ltrim($urlPath, '/');
+
+        if ($content !== NULL && (is_array($content) || is_object($content))) {
+            $headers['Content-Type'] = 'application/json; charset=utf-8';
+            $content = Helpers::jsonEncode($content);
+        }
+
+        return new Http\Request($method, $url, $headers, $content);
+    }
+
+
+    /**
+     * @param  Http\Response
+     * @param  array|NULL  these codes are treated as success; code < 300 if NULL
+     * @return mixed
+     *
+     * @throws ApiException
+     */
+    public function decode(Http\Response $response, array $okCodes = NULL)
+    {
+        $content = $response->getContent();
+        if (preg_match('~application/json~i', $response->getHeader('Content-Type', ''))) {
+            try {
+                $content = Helpers::jsonDecode($response->getContent(), true);
+            } catch (JsonException $e) {
+                throw new InvalidResponseException('JSON decoding failed.', 0, $e, $response);
+            }
+
+            if (!is_array($content) && !is_object($content)) {
+                throw new InvalidResponseException('Decoded JSON is not an array or object.', 0, NULL, $response);
+            }
+        }
+
+        $code = $response->getCode();
+        if (($okCodes === NULL && $code >= 300) || (is_array($okCodes) && !in_array($code, $okCodes))) {
+            /** @var $content \stdClass */
+            switch ($code) {
+                case Http\Response::S400_BAD_REQUEST:
+                    throw new BadRequestException(self::errorMessage($content), $code, NULL, $response);
+
+                case Http\Response::S401_UNAUTHORIZED:
+                    throw new UnauthorizedException(self::errorMessage($content), $code, NULL, $response);
+
+                case Http\Response::S403_FORBIDDEN:
+                    if ($response->getHeader('X-RateLimit-Remaining') === '0') {
+                        throw new RateLimitExceedException(self::errorMessage($content), $code, NULL, $response);
+                    }
+                    throw new ForbiddenException(self::errorMessage($content), $code, NULL, $response);
+
+                case Http\Response::S404_NOT_FOUND:
+                    throw new NotFoundException('Resource not found or not authorized to access.', $code, NULL, $response);
+
+                case Http\Response::S422_UNPROCESSABLE_ENTITY:
+                    throw new UnprocessableEntityException(self::errorMessage($content), $code, NULL, $response);
+            }
+
+            $message = $okCodes === NULL ? '< 300' : implode(' or ', $okCodes);
+            throw new UnexpectedResponseException("Expected response with code $message.", $code, NULL, $response);
+        }
+
+        return $content;
+    }
+
+
+    /**
+     * Creates paginator for HTTP GET requests.
+     *
+     * @see get()
+     *
+     * @param  string
+     * @return Paginator
+     *
+     * @throws MissingParameterException
+     */
+    public function paginator($urlPath, array $parameters = [], array $headers = [])
+    {
+        return new Paginator(
+            $this,
+            $this->createRequest(Http\Request::GET, $urlPath, $parameters, $headers)
+        );
+    }
+
+
+    /**
+     * @return Http\IClient
+     */
+    public function getClient()
+    {
+        return $this->client;
+    }
+
+
+    /**
+     * @param  string
+     * @return Api
+     */
+    public function withUrl($url)
+    {
+        $api = clone $this;
+        $api->setUrl($url);
+        return $api;
+    }
+
+
+    /**
+     * @param  string
+     * @return self
+     */
+    public function setUrl($url)
+    {
+        $this->url = $url;
+        return $this;
+    }
+
+
+    /**
+     * @return string
+     */
+    public function getUrl()
+    {
+        return $this->url;
+    }
+
+
+    /**
+     * @param  string
+     * @return string
+     *
+     * @throws MissingParameterException
+     */
+    protected function expandColonParameters($url, array $parameters, array $defaultParameters)
+    {
+        $parameters += $defaultParameters;
+
+        $url = preg_replace_callback('#(^|/|\.):([^/.]+)#', function($m) use ($url, & $parameters) {
+            if (!isset($parameters[$m[2]])) {
+                throw new MissingParameterException("Missing parameter '$m[2]' for URL path '$url'.");
+            }
+            $parameter = $parameters[$m[2]];
+            unset($parameters[$m[2]]);
+            return $m[1] . rawurlencode($parameter);
+        }, $url);
+
+        $url = rtrim($url, '/');
+
+        if (count($parameters)) {
+            $url .= '?' . http_build_query($parameters);
+        }
+
+        return $url;
+    }
+
+
+    /**
+     * Expands URI template (RFC 6570).
+     *
+     * @see http://tools.ietf.org/html/rfc6570
+     * @todo Inject remaining default parameters into query string?
+     *
+     * @param  string
+     * @return string
+     */
+    protected function expandUriTemplate($url, array $parameters, array $defaultParameters)
+    {
+        $parameters += $defaultParameters;
+
+        static $operatorFlags = [
+            ''  => ['prefix' => '',  'separator' => ',', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => FALSE],
+            '+' => ['prefix' => '',  'separator' => ',', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => TRUE],
+            '#' => ['prefix' => '#', 'separator' => ',', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => TRUE],
+            '.' => ['prefix' => '.', 'separator' => '.', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => FALSE],
+            '/' => ['prefix' => '/', 'separator' => '/', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => FALSE],
+            ';' => ['prefix' => ';', 'separator' => ';', 'named' => TRUE,  'ifEmpty' => '',  'reserved' => FALSE],
+            '?' => ['prefix' => '?', 'separator' => '&', 'named' => TRUE,  'ifEmpty' => '=', 'reserved' => FALSE],
+            '&' => ['prefix' => '&', 'separator' => '&', 'named' => TRUE,  'ifEmpty' => '=', 'reserved' => FALSE],
+        ];
+
+        return preg_replace_callback('~{([+#./;?&])?([^}]+?)}~', function($m) use ($url, & $parameters, $operatorFlags) {
+            $flags = $operatorFlags[$m[1]];
+
+            $translated = [];
+            foreach (explode(',', $m[2]) as $name) {
+                $explode = FALSE;
+                $maxLength = NULL;
+                if (preg_match('~^(.+)(?:(\*)|:(\d+))$~', $name, $tmp)) { // TODO: Speed up?
+                    $name = $tmp[1];
+                    if (isset($tmp[3])) {
+                        $maxLength = (int) $tmp[3];
+                    } else {
+                        $explode = TRUE;
+                    }
+                }
+
+                if (!isset($parameters[$name])) {  // TODO: Throw exception?
+                    continue;
+                }
+
+                $value = $parameters[$name];
+                if (is_scalar($value)) {
+                    $translated[] = $this->prefix($flags, $name, $this->escape($flags, $value, $maxLength));
+
+                } else {
+                    $value = (array) $value;
+                    $isAssoc = key($value) !== 0;
+
+                    // The '*' (explode) modifier
+                    if ($explode) {
+                        $parts = [];
+                        if ($isAssoc) {
+                            $this->walk($value, function ($v, $k) use (& $parts, $flags, $maxLength) {
+                                $parts[] = $this->prefix(['named' => TRUE] + $flags, $k, $this->escape($flags, $v, $maxLength));
+                            });
+
+                        } elseif ($flags['named']) {
+                            $this->walk($value, function ($v) use (& $parts, $flags, $name, $maxLength) {
+                                $parts[] = $this->prefix($flags, $name, $this->escape($flags, $v, $maxLength));
+                            });
+
+                        } else {
+                            $this->walk($value, function ($v) use (& $parts, $flags, $maxLength) {
+                                $parts[] = $this->escape($flags, $v, $maxLength);
+                            });
+                        }
+
+                        if (isset($parts[0])) {
+                            if ($flags['named']) {
+                                $translated[] = implode($flags['separator'], $parts);
+                            } else {
+                                $translated[] = $this->prefix($flags, $name, implode($flags['separator'], $parts));
+                            }
+                        }
+
+                    } else {
+                        $parts = [];
+                        $this->walk($value, function($v, $k) use (& $parts, $isAssoc, $flags, $maxLength) {
+                            if ($isAssoc) {
+                                $parts[] = $this->escape($flags, $k);
+                            }
+
+                            $parts[] = $this->escape($flags, $v, $maxLength);
+                        });
+
+                        if (isset($parts[0])) {
+                            $translated[] = $this->prefix($flags, $name, implode(',', $parts));
+                        }
+                    }
+                }
+            }
+
+            if (isset($translated[0])) {
+                return $flags['prefix'] . implode($flags['separator'], $translated);
+            }
+
+            return '';
+        }, $url);
+    }
+
+
+    /**
+     * @param  array
+     * @param  string
+     * @param  string  already escaped
+     * @return string
+     */
+    private function prefix(array $flags, $name, $value)
+    {
+        $prefix = '';
+        if ($flags['named']) {
+            $prefix .= $this->escape($flags, $name);
+            if (isset($value[0])) {
+                $prefix .= '=';
+            } else {
+                $prefix .= $flags['ifEmpty'];
+            }
+        }
+
+        return $prefix . $value;
+    }
+
+
+    /**
+     * @param  array
+     * @param  mixed
+     * @param  int|NULL
+     * @return string
+     */
+    private function escape(array $flags, $value, $maxLength = NULL)
+    {
+        $value = (string) $value;
+
+        if ($maxLength !== NULL) {
+            if (preg_match('~^(.{' . $maxLength . '}).~u', $value, $m)) {
+                $value = $m[1];
+            } elseif (strlen($value) > $maxLength) {  # when malformed UTF-8
+                $value = substr($value, 0, $maxLength);
+            }
+        }
+
+        if ($flags['reserved']) {
+            $parts = preg_split('~(%[0-9a-fA-F]{2}|[:/?#[\]@!$&\'()*+,;=])~', $value, -1, PREG_SPLIT_DELIM_CAPTURE);
+            $parts[] = '';
+
+            $escaped = '';
+            for ($i = 0, $count = count($parts); $i < $count; $i += 2) {
+                $escaped .= rawurlencode($parts[$i]) . $parts[$i + 1];
+            }
+
+            return $escaped;
+        }
+
+        return rawurlencode($value);
+    }
+
+
+    /**
+     * @param  array
+     * @param  callable
+     */
+    private function walk(array $array, $cb)
+    {
+        foreach ($array as $k => $v) {
+            if ($v === NULL) {
+                continue;
+            }
+
+            $cb($v, $k);
+        }
+    }
+
+
+    /**
+     * @param  \stdClass
+     * @return string
+     */
+    private static function errorMessage($content)
+    {
+        $message = isset($content->message)
+            ? $content->message
+            : 'Unknown error';
+
+        if (isset($content->errors)) {
+            $message .= implode(', ', array_map(function($error) {
+                return '[' . implode(':', (array) $error) . ']';
+            }, $content->errors));
+        }
+
+        return $message;
+    }
 
 }

Spacing +19 added lines, -19 removed lines

@@ -254,7 +254,7 @@ 
 			$urlPath = $this->expandUriTemplate($urlPath, $parameters, $this->defaultParameters);
 		}
 
-		$url = rtrim($baseUrl, '/') . '/' . ltrim($urlPath, '/');
+		$url = rtrim($baseUrl, '/').'/'.ltrim($urlPath, '/');
 
 		if ($content !== NULL && (is_array($content) || is_object($content))) {
 			$headers['Content-Type'] = 'application/json; charset=utf-8';
@@ -394,13 +394,13 @@ 
 			}
 			$parameter = $parameters[$m[2]];
 			unset($parameters[$m[2]]);
-			return $m[1] . rawurlencode($parameter);
+			return $m[1].rawurlencode($parameter);
 		}, $url);
 
 		$url = rtrim($url, '/');
 
 		if (count($parameters)) {
-			$url .= '?' . http_build_query($parameters);
+			$url .= '?'.http_build_query($parameters);
 		}
 
 		return $url;
@@ -421,14 +421,14 @@ 
 		$parameters += $defaultParameters;
 
 		static $operatorFlags = [
-			''  => ['prefix' => '',  'separator' => ',', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => FALSE],
-			'+' => ['prefix' => '',  'separator' => ',', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => TRUE],
-			'#' => ['prefix' => '#', 'separator' => ',', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => TRUE],
-			'.' => ['prefix' => '.', 'separator' => '.', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => FALSE],
-			'/' => ['prefix' => '/', 'separator' => '/', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => FALSE],
-			';' => ['prefix' => ';', 'separator' => ';', 'named' => TRUE,  'ifEmpty' => '',  'reserved' => FALSE],
-			'?' => ['prefix' => '?', 'separator' => '&', 'named' => TRUE,  'ifEmpty' => '=', 'reserved' => FALSE],
-			'&' => ['prefix' => '&', 'separator' => '&', 'named' => TRUE,  'ifEmpty' => '=', 'reserved' => FALSE],
+			''  => ['prefix' => '', 'separator' => ',', 'named' => FALSE, 'ifEmpty' => '', 'reserved' => FALSE],
+			'+' => ['prefix' => '', 'separator' => ',', 'named' => FALSE, 'ifEmpty' => '', 'reserved' => TRUE],
+			'#' => ['prefix' => '#', 'separator' => ',', 'named' => FALSE, 'ifEmpty' => '', 'reserved' => TRUE],
+			'.' => ['prefix' => '.', 'separator' => '.', 'named' => FALSE, 'ifEmpty' => '', 'reserved' => FALSE],
+			'/' => ['prefix' => '/', 'separator' => '/', 'named' => FALSE, 'ifEmpty' => '', 'reserved' => FALSE],
+			';' => ['prefix' => ';', 'separator' => ';', 'named' => TRUE, 'ifEmpty' => '', 'reserved' => FALSE],
+			'?' => ['prefix' => '?', 'separator' => '&', 'named' => TRUE, 'ifEmpty' => '=', 'reserved' => FALSE],
+			'&' => ['prefix' => '&', 'separator' => '&', 'named' => TRUE, 'ifEmpty' => '=', 'reserved' => FALSE],
 		];
 
 		return preg_replace_callback('~{([+#./;?&])?([^}]+?)}~', function($m) use ($url, & $parameters, $operatorFlags) {
@@ -463,17 +463,17 @@ 
 					if ($explode) {
 						$parts = [];
 						if ($isAssoc) {
-							$this->walk($value, function ($v, $k) use (& $parts, $flags, $maxLength) {
+							$this->walk($value, function($v, $k) use (& $parts, $flags, $maxLength) {
 								$parts[] = $this->prefix(['named' => TRUE] + $flags, $k, $this->escape($flags, $v, $maxLength));
 							});
 
 						} elseif ($flags['named']) {
-							$this->walk($value, function ($v) use (& $parts, $flags, $name, $maxLength) {
+							$this->walk($value, function($v) use (& $parts, $flags, $name, $maxLength) {
 								$parts[] = $this->prefix($flags, $name, $this->escape($flags, $v, $maxLength));
 							});
 
 						} else {
-							$this->walk($value, function ($v) use (& $parts, $flags, $maxLength) {
+							$this->walk($value, function($v) use (& $parts, $flags, $maxLength) {
 								$parts[] = $this->escape($flags, $v, $maxLength);
 							});
 						}
@@ -504,7 +504,7 @@ 
 			}
 
 			if (isset($translated[0])) {
-				return $flags['prefix'] . implode($flags['separator'], $translated);
+				return $flags['prefix'].implode($flags['separator'], $translated);
 			}
 
 			return '';
@@ -530,7 +530,7 @@ 
 			}
 		}
 
-		return $prefix . $value;
+		return $prefix.$value;
 	}
 
 
@@ -545,7 +545,7 @@ 
 		$value = (string) $value;
 
 		if ($maxLength !== NULL) {
-			if (preg_match('~^(.{' . $maxLength . '}).~u', $value, $m)) {
+			if (preg_match('~^(.{'.$maxLength.'}).~u', $value, $m)) {
 				$value = $m[1];
 			} elseif (strlen($value) > $maxLength) {  # when malformed UTF-8
 				$value = substr($value, 0, $maxLength);
@@ -558,7 +558,7 @@ 
 
 			$escaped = '';
 			for ($i = 0, $count = count($parts); $i < $count; $i += 2) {
-				$escaped .= rawurlencode($parts[$i]) . $parts[$i + 1];
+				$escaped .= rawurlencode($parts[$i]).$parts[$i + 1];
 			}
 
 			return $escaped;
@@ -596,7 +596,7 @@ 
 
 		if (isset($content->errors)) {
 			$message .= implode(', ', array_map(function($error) {
-				return '[' . implode(':', (array) $error) . ']';
+				return '['.implode(':', (array) $error).']';
 			}, $content->errors));
 		}
 

class/Github/Http/CachedClient.php

Indentation +126 added lines, -126 removed lines

@@ -13,131 +13,131 @@
  */
 class CachedClient extends Github\Sanity implements IClient
 {
-	/** @var Storages\ICache|NULL */
-	private $cache;
-
-	/** @var IClient */
-	private $client;
-
-	/** @var bool */
-	private $forbidRecheck;
-
-	/** @var callable|NULL */
-	private $onResponse;
-
-
-	/**
-	 * @param Storages\ICache
-	 * @param IClient
-	 * @param bool  forbid checking Github for new data; more or less development purpose only
-	 */
-	public function __construct(Storages\ICache $cache, IClient $client = NULL, $forbidRecheck = FALSE)
-	{
-		$this->cache = $cache;
-		$this->client = $client ?: Github\Helpers::createDefaultClient();
-		$this->forbidRecheck = (bool) $forbidRecheck;
-	}
-
-
-	/**
-	 * @return IClient
-	 */
-	public function getInnerClient()
-	{
-		return $this->client;
-	}
-
-
-	/**
-	 * @return Response
-	 *
-	 * @throws BadResponseException
-	 */
-	public function request(Request $request)
-	{
-		$request = clone $request;
-
-		$cacheKey = implode('.', [
-			$request->getMethod(),
-			$request->getUrl(),
-
-			/** @todo This should depend on Vary: header */
-			$request->getHeader('Accept'),
-			$request->getHeader('Accept-Encoding'),
-			$request->getHeader('Authorization')
-		]);
-
-		if ($cached = $this->cache->load($cacheKey)) {
-			if ($this->forbidRecheck) {
-				$cached = clone $cached;
-				$this->onResponse && call_user_func($this->onResponse, $cached);
-				return $cached;
-			}
-
-			/** @var $cached Response */
-			if ($cached->hasHeader('Last-Modified')) {
-				$request->addHeader('If-Modified-Since', $cached->getHeader('Last-Modified'));
-			}
-			if ($cached->hasHeader('ETag')) {
-				$request->addHeader('If-None-Match', $cached->getHeader('ETag'));
-			}
-		}
-
-		$response = $this->client->request($request);
-
-		if ($this->isCacheable($response)) {
-			$this->cache->save($cacheKey, clone $response);
-		}
-
-		if (isset($cached) && $response->getCode() === Response::S304_NOT_MODIFIED) {
-			$cached = clone $cached;
-
-			/** @todo Should be responses somehow combined into one? */
-			$response = $cached->setPrevious($response);
-		}
-
-		$this->onResponse && call_user_func($this->onResponse, $response);
-
-		return $response;
-	}
-
-
-	/**
-	 * @param  callable|NULL function(Request $request)
-	 * @return self
-	 */
-	public function onRequest($callback)
-	{
-		$this->client->onRequest($callback);
-		return $this;
-	}
-
-
-	/**
-	 * @param  callable|NULL function(Response $response)
-	 * @return self
-	 */
-	public function onResponse($callback)
-	{
-		$this->client->onResponse(NULL);
-		$this->onResponse = $callback;
-		return $this;
-	}
-
-
-	/**
-	 * @return bool
-	 */
-	protected function isCacheable(Response $response)
-	{
-		/** @todo Do it properly. Vary:, Pragma:, TTL...  */
-		if (!$response->isCode(200)) {
-			return FALSE;
-		} elseif (preg_match('#max-age=0|must-revalidate#i', $response->getHeader('Cache-Control', ''))) {
-			return FALSE;
-		}
-
-		return $response->hasHeader('ETag') || $response->hasHeader('Last-Modified');
-	}
+    /** @var Storages\ICache|NULL */
+    private $cache;
+
+    /** @var IClient */
+    private $client;
+
+    /** @var bool */
+    private $forbidRecheck;
+
+    /** @var callable|NULL */
+    private $onResponse;
+
+
+    /**
+     * @param Storages\ICache
+     * @param IClient
+     * @param bool  forbid checking Github for new data; more or less development purpose only
+     */
+    public function __construct(Storages\ICache $cache, IClient $client = NULL, $forbidRecheck = FALSE)
+    {
+        $this->cache = $cache;
+        $this->client = $client ?: Github\Helpers::createDefaultClient();
+        $this->forbidRecheck = (bool) $forbidRecheck;
+    }
+
+
+    /**
+     * @return IClient
+     */
+    public function getInnerClient()
+    {
+        return $this->client;
+    }
+
+
+    /**
+     * @return Response
+     *
+     * @throws BadResponseException
+     */
+    public function request(Request $request)
+    {
+        $request = clone $request;
+
+        $cacheKey = implode('.', [
+            $request->getMethod(),
+            $request->getUrl(),
+
+            /** @todo This should depend on Vary: header */
+            $request->getHeader('Accept'),
+            $request->getHeader('Accept-Encoding'),
+            $request->getHeader('Authorization')
+        ]);
+
+        if ($cached = $this->cache->load($cacheKey)) {
+            if ($this->forbidRecheck) {
+                $cached = clone $cached;
+                $this->onResponse && call_user_func($this->onResponse, $cached);
+                return $cached;
+            }
+
+            /** @var $cached Response */
+            if ($cached->hasHeader('Last-Modified')) {
+                $request->addHeader('If-Modified-Since', $cached->getHeader('Last-Modified'));
+            }
+            if ($cached->hasHeader('ETag')) {
+                $request->addHeader('If-None-Match', $cached->getHeader('ETag'));
+            }
+        }
+
+        $response = $this->client->request($request);
+
+        if ($this->isCacheable($response)) {
+            $this->cache->save($cacheKey, clone $response);
+        }
+
+        if (isset($cached) && $response->getCode() === Response::S304_NOT_MODIFIED) {
+            $cached = clone $cached;
+
+            /** @todo Should be responses somehow combined into one? */
+            $response = $cached->setPrevious($response);
+        }
+
+        $this->onResponse && call_user_func($this->onResponse, $response);
+
+        return $response;
+    }
+
+
+    /**
+     * @param  callable|NULL function(Request $request)
+     * @return self
+     */
+    public function onRequest($callback)
+    {
+        $this->client->onRequest($callback);
+        return $this;
+    }
+
+
+    /**
+     * @param  callable|NULL function(Response $response)
+     * @return self
+     */
+    public function onResponse($callback)
+    {
+        $this->client->onResponse(NULL);
+        $this->onResponse = $callback;
+        return $this;
+    }
+
+
+    /**
+     * @return bool
+     */
+    protected function isCacheable(Response $response)
+    {
+        /** @todo Do it properly. Vary:, Pragma:, TTL...  */
+        if (!$response->isCode(200)) {
+            return FALSE;
+        } elseif (preg_match('#max-age=0|must-revalidate#i', $response->getHeader('Cache-Control', ''))) {
+            return FALSE;
+        }
+
+        return $response->hasHeader('ETag') || $response->hasHeader('Last-Modified');
+    }
 
 }

class/Github/Http/StreamClient.php

Indentation +103 added lines, -103 removed lines

@@ -10,108 +10,108 @@
  */
 class StreamClient extends AbstractClient
 {
-	/** @var array|NULL */
-	private $sslOptions;
-
-
-	/**
-	 * @param  array  SSL context options {@link http://php.net/manual/en/context.ssl.php}
-	 */
-	public function __construct(array $sslOptions = NULL)
-	{
-		$this->sslOptions = $sslOptions;
-	}
-
-
-	protected function setupRequest(Request $request)
-	{
-		parent::setupRequest($request);
-		$request->setHeader('Connection', 'close');
-	}
-
-
-	/**
-	 * @return Response
-	 *
-	 * @throws BadResponseException
-	 */
-	protected function process(Request $request)
-	{
-		$headerStr = [];
-		foreach ($request->getHeaders() as $name => $value) {
-			foreach ((array) $value as $v) {
-				$headerStr[] = "$name: $v";
-			}
-		}
-
-		$options = [
-			'http' => [
-				'method' => $request->getMethod(),
-				'header' => implode("\r\n", $headerStr) . "\r\n",
-				'follow_location' => 0,  # Github sets the Location header for 201 code too and redirection is not required for us
-				'protocol_version' => 1.1,
-				'ignore_errors' => TRUE,
-			],
-			'ssl' => [
-				'verify_peer' => TRUE,
-				'cafile' => realpath(__DIR__ . '/../../ca-chain.crt'),
-				'disable_compression' => TRUE,  # Effective since PHP 5.4.13
-			],
-		];
-
-		if (($content = $request->getContent()) !== NULL) {
-			$options['http']['content'] = $content;
-		}
-
-		if ($this->sslOptions) {
-			$options['ssl'] = $this->sslOptions + $options['ssl'];
-		}
-
-		list($code, $headers, $content) = $this->fileGetContents($request->getUrl(), $options);
-		return new Response($code, $headers, $content);
-	}
-
-
-	/**
-	 * @internal
-	 * @param  string
-	 * @param  array
-	 * @return array
-	 *
-	 * @throws BadResponseException
-	 */
-	protected function fileGetContents($url, array $contextOptions)
-	{
-		$context = stream_context_create($contextOptions);
-
-		$e = NULL;
-		set_error_handler(function($severity, $message, $file, $line) use (& $e) {
-			$e = new \ErrorException($message, 0, $severity, $file, $line, $e);
-		}, E_WARNING);
-
-		$content = file_get_contents($url, FALSE, $context);
-		restore_error_handler();
-
-		if (!isset($http_response_header)) {
-			throw new BadResponseException('Missing HTTP headers, request failed.', 0, $e);
-		}
-
-		if (!isset($http_response_header[0]) || !preg_match('~^HTTP/1[.]. (\d{3})~i', $http_response_header[0], $m)) {
-			throw new BadResponseException('HTTP status code is missing.', 0, $e);
-		}
-		unset($http_response_header[0]);
-
-		$headers = [];
-		foreach ($http_response_header as $header) {
-			if (in_array(substr($header, 0, 1), [' ', "\t"], TRUE)) {
-				$headers[$last] .= ' ' . trim($header);  # RFC2616, 2.2
-			} else {
-				list($name, $value) = explode(':', $header, 2) + [NULL, NULL];
-				$headers[$last = trim($name)] = trim($value);
-			}
-		}
-
-		return [$m[1], $headers, $content];
-	}
+    /** @var array|NULL */
+    private $sslOptions;
+
+
+    /**
+     * @param  array  SSL context options {@link http://php.net/manual/en/context.ssl.php}
+     */
+    public function __construct(array $sslOptions = NULL)
+    {
+        $this->sslOptions = $sslOptions;
+    }
+
+
+    protected function setupRequest(Request $request)
+    {
+        parent::setupRequest($request);
+        $request->setHeader('Connection', 'close');
+    }
+
+
+    /**
+     * @return Response
+     *
+     * @throws BadResponseException
+     */
+    protected function process(Request $request)
+    {
+        $headerStr = [];
+        foreach ($request->getHeaders() as $name => $value) {
+            foreach ((array) $value as $v) {
+                $headerStr[] = "$name: $v";
+            }
+        }
+
+        $options = [
+            'http' => [
+                'method' => $request->getMethod(),
+                'header' => implode("\r\n", $headerStr) . "\r\n",
+                'follow_location' => 0,  # Github sets the Location header for 201 code too and redirection is not required for us
+                'protocol_version' => 1.1,
+                'ignore_errors' => TRUE,
+            ],
+            'ssl' => [
+                'verify_peer' => TRUE,
+                'cafile' => realpath(__DIR__ . '/../../ca-chain.crt'),
+                'disable_compression' => TRUE,  # Effective since PHP 5.4.13
+            ],
+        ];
+
+        if (($content = $request->getContent()) !== NULL) {
+            $options['http']['content'] = $content;
+        }
+
+        if ($this->sslOptions) {
+            $options['ssl'] = $this->sslOptions + $options['ssl'];
+        }
+
+        list($code, $headers, $content) = $this->fileGetContents($request->getUrl(), $options);
+        return new Response($code, $headers, $content);
+    }
+
+
+    /**
+     * @internal
+     * @param  string
+     * @param  array
+     * @return array
+     *
+     * @throws BadResponseException
+     */
+    protected function fileGetContents($url, array $contextOptions)
+    {
+        $context = stream_context_create($contextOptions);
+
+        $e = NULL;
+        set_error_handler(function($severity, $message, $file, $line) use (& $e) {
+            $e = new \ErrorException($message, 0, $severity, $file, $line, $e);
+        }, E_WARNING);
+
+        $content = file_get_contents($url, FALSE, $context);
+        restore_error_handler();
+
+        if (!isset($http_response_header)) {
+            throw new BadResponseException('Missing HTTP headers, request failed.', 0, $e);
+        }
+
+        if (!isset($http_response_header[0]) || !preg_match('~^HTTP/1[.]. (\d{3})~i', $http_response_header[0], $m)) {
+            throw new BadResponseException('HTTP status code is missing.', 0, $e);
+        }
+        unset($http_response_header[0]);
+
+        $headers = [];
+        foreach ($http_response_header as $header) {
+            if (in_array(substr($header, 0, 1), [' ', "\t"], TRUE)) {
+                $headers[$last] .= ' ' . trim($header);  # RFC2616, 2.2
+            } else {
+                list($name, $value) = explode(':', $header, 2) + [NULL, NULL];
+                $headers[$last = trim($name)] = trim($value);
+            }
+        }
+
+        return [$m[1], $headers, $content];
+    }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -47,15 +47,15 @@ 
 		$options = [
 			'http' => [
 				'method' => $request->getMethod(),
-				'header' => implode("\r\n", $headerStr) . "\r\n",
-				'follow_location' => 0,  # Github sets the Location header for 201 code too and redirection is not required for us
+				'header' => implode("\r\n", $headerStr)."\r\n",
+				'follow_location' => 0, # Github sets the Location header for 201 code too and redirection is not required for us
 				'protocol_version' => 1.1,
 				'ignore_errors' => TRUE,
 			],
 			'ssl' => [
 				'verify_peer' => TRUE,
-				'cafile' => realpath(__DIR__ . '/../../ca-chain.crt'),
-				'disable_compression' => TRUE,  # Effective since PHP 5.4.13
+				'cafile' => realpath(__DIR__.'/../../ca-chain.crt'),
+				'disable_compression' => TRUE, # Effective since PHP 5.4.13
 			],
 		];
 
@@ -104,7 +104,7 @@ 
 		$headers = [];
 		foreach ($http_response_header as $header) {
 			if (in_array(substr($header, 0, 1), [' ', "\t"], TRUE)) {
-				$headers[$last] .= ' ' . trim($header);  # RFC2616, 2.2
+				$headers[$last] .= ' '.trim($header); # RFC2616, 2.2
 			} else {
 				list($name, $value) = explode(':', $header, 2) + [NULL, NULL];
 				$headers[$last = trim($name)] = trim($value);

class/Github/Http/Request.php

Indentation +79 added lines, -79 removed lines

@@ -12,84 +12,84 @@
  */
 class Request extends Message
 {
-	/** HTTP request method */
-	const
-		DELETE = 'DELETE',
-		GET = 'GET',
-		HEAD = 'HEAD',
-		PATCH = 'PATCH',
-		POST = 'POST',
-		PUT = 'PUT';
-
-
-	/** @var string */
-	private $method;
-
-	/** @var string */
-	private $url;
-
-
-	/**
-	 * @param  string
-	 * @param  string
-	 * @param  array
-	 * @param  string|NULL
-	 */
-	public function __construct($method, $url, array $headers = [], $content = NULL)
-	{
-		$this->method = $method;
-		$this->url = $url;
-		parent::__construct($headers, $content);
-	}
-
-
-	/**
-	 * @param  string
-	 * @return bool
-	 */
-	public function isMethod($method)
-	{
-		return strcasecmp($this->method, $method) === 0;
-	}
-
-
-	/**
-	 * @return string
-	 */
-	public function getMethod()
-	{
-		return $this->method;
-	}
-
-
-	/**
-	 * @return string
-	 */
-	public function getUrl()
-	{
-		return $this->url;
-	}
-
-
-	/**
-	 * @param  string
-	 * @param  string
-	 * @return self
-	 */
-	public function addHeader($name, $value)
-	{
-		return parent::addHeader($name, $value);
-	}
-
-
-	/**
-	 * @param  string
-	 * @param  string|NULL
-	 * @return self
-	 */
-	public function setHeader($name, $value)
-	{
-		return parent::setHeader($name, $value);
-	}
+    /** HTTP request method */
+    const
+        DELETE = 'DELETE',
+        GET = 'GET',
+        HEAD = 'HEAD',
+        PATCH = 'PATCH',
+        POST = 'POST',
+        PUT = 'PUT';
+
+
+    /** @var string */
+    private $method;
+
+    /** @var string */
+    private $url;
+
+
+    /**
+     * @param  string
+     * @param  string
+     * @param  array
+     * @param  string|NULL
+     */
+    public function __construct($method, $url, array $headers = [], $content = NULL)
+    {
+        $this->method = $method;
+        $this->url = $url;
+        parent::__construct($headers, $content);
+    }
+
+
+    /**
+     * @param  string
+     * @return bool
+     */
+    public function isMethod($method)
+    {
+        return strcasecmp($this->method, $method) === 0;
+    }
+
+
+    /**
+     * @return string
+     */
+    public function getMethod()
+    {
+        return $this->method;
+    }
+
+
+    /**
+     * @return string
+     */
+    public function getUrl()
+    {
+        return $this->url;
+    }
+
+
+    /**
+     * @param  string
+     * @param  string
+     * @return self
+     */
+    public function addHeader($name, $value)
+    {
+        return parent::addHeader($name, $value);
+    }
+
+
+    /**
+     * @param  string
+     * @param  string|NULL
+     * @return self
+     */
+    public function setHeader($name, $value)
+    {
+        return parent::setHeader($name, $value);
+    }
 
 }

class/Github/Http/Message.php

Indentation +92 added lines, -92 removed lines

@@ -12,97 +12,97 @@
  */
 abstract class Message extends Github\Sanity
 {
-	/** @var array[name => value] */
-	private $headers = [];
-
-	/** @var string|NULL */
-	private $content;
-
-
-	/**
-	 * @param  array
-	 * @param  string|NULL
-	 */
-	public function __construct(array $headers = [], $content = NULL)
-	{
-		$this->headers = array_change_key_case($headers, CASE_LOWER);
-		$this->content = $content;
-	}
-
-
-	/**
-	 * @param  string
-	 * @return bool
-	 */
-	public function hasHeader($name)
-	{
-		return array_key_exists(strtolower($name), $this->headers);
-	}
-
-
-	/**
-	 * @param  string
-	 * @param  mixed
-	 * @return mixed
-	 */
-	public function getHeader($name, $default = NULL)
-	{
-		$name = strtolower($name);
-		return array_key_exists($name, $this->headers)
-			? $this->headers[$name]
-			: $default;
-	}
-
-
-	/**
-	 * @param  string
-	 * @param  string
-	 * @return self
-	 */
-	protected function addHeader($name, $value)
-	{
-		$name = strtolower($name);
-		if (!array_key_exists($name, $this->headers) && $value !== NULL) {
-			$this->headers[$name] = $value;
-		}
-
-		return $this;
-	}
-
-
-	/**
-	 * @param  string
-	 * @param  string|NULL
-	 * @return self
-	 */
-	protected function setHeader($name, $value)
-	{
-		$name = strtolower($name);
-		if ($value === NULL) {
-			unset($this->headers[$name]);
-		} else {
-			$this->headers[$name] = $value;
-		}
-
-		return $this;
-	}
-
-
-	/**
-	 * @return array
-	 */
-	public function getHeaders()
-	{
-		return $this->headers;
-	}
-
-
-	/**
-	 * @return string|NULL
-	 */
-	public function getContent()
-	{
-		return $this->content;
-	}
+    /** @var array[name => value] */
+    private $headers = [];
+
+    /** @var string|NULL */
+    private $content;
+
+
+    /**
+     * @param  array
+     * @param  string|NULL
+     */
+    public function __construct(array $headers = [], $content = NULL)
+    {
+        $this->headers = array_change_key_case($headers, CASE_LOWER);
+        $this->content = $content;
+    }
+
+
+    /**
+     * @param  string
+     * @return bool
+     */
+    public function hasHeader($name)
+    {
+        return array_key_exists(strtolower($name), $this->headers);
+    }
+
+
+    /**
+     * @param  string
+     * @param  mixed
+     * @return mixed
+     */
+    public function getHeader($name, $default = NULL)
+    {
+        $name = strtolower($name);
+        return array_key_exists($name, $this->headers)
+            ? $this->headers[$name]
+            : $default;
+    }
+
+
+    /**
+     * @param  string
+     * @param  string
+     * @return self
+     */
+    protected function addHeader($name, $value)
+    {
+        $name = strtolower($name);
+        if (!array_key_exists($name, $this->headers) && $value !== NULL) {
+            $this->headers[$name] = $value;
+        }
+
+        return $this;
+    }
+
+
+    /**
+     * @param  string
+     * @param  string|NULL
+     * @return self
+     */
+    protected function setHeader($name, $value)
+    {
+        $name = strtolower($name);
+        if ($value === NULL) {
+            unset($this->headers[$name]);
+        } else {
+            $this->headers[$name] = $value;
+        }
+
+        return $this;
+    }
+
+
+    /**
+     * @return array
+     */
+    public function getHeaders()
+    {
+        return $this->headers;
+    }
+
+
+    /**
+     * @return string|NULL
+     */
+    public function getContent()
+    {
+        return $this->content;
+    }
 
 }

class/Github/Http/CurlClient.php

Indentation +105 added lines, -105 removed lines

@@ -12,110 +12,110 @@
  */
 class CurlClient extends AbstractClient
 {
-	/** @var array|NULL */
-	private $options;
-
-	/** @var resource */
-	private $curl;
-
-
-	/**
-	 * @param  array  cURL options {@link http://php.net/manual/en/function.curl-setopt.php}
-	 *
-	 * @throws Github\LogicException
-	 */
-	public function __construct(array $options = NULL)
-	{
-		if (!extension_loaded('curl')) {
-			throw new Github\LogicException('cURL extension is not loaded.');
-		}
-
-		$this->options = $options;
-	}
-
-
-	protected function setupRequest(Request $request)
-	{
-		parent::setupRequest($request);
-		$request->addHeader('Connection', 'keep-alive');
-	}
-
-
-	/**
-	 * @return Response
-	 *
-	 * @throws BadResponseException
-	 */
-	protected function process(Request $request)
-	{
-		$headers = [];
-		foreach ($request->getHeaders() as $name => $value) {
-			$headers[] = "$name: $value";
-		}
-
-		$responseHeaders = [];
-		$softOptions = [
-			CURLOPT_CONNECTTIMEOUT => 10,
-			CURLOPT_SSL_VERIFYHOST => 2,
-			CURLOPT_SSL_VERIFYPEER => 1,
-			CURLOPT_CAINFO => realpath(__DIR__ . '/../ca-chain.crt'),
-		];
-
-		$hardOptions = [
-			CURLOPT_FOLLOWLOCATION => FALSE, # Github sets the Location header for 201 code too and redirection is not required for us
-			CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
-			CURLOPT_CUSTOMREQUEST => $request->getMethod(),
-			CURLOPT_NOBODY => $request->isMethod(Request::HEAD),
-			CURLOPT_URL => $request->getUrl(),
-			CURLOPT_HTTPHEADER => $headers,
-			CURLOPT_RETURNTRANSFER => TRUE,
-			CURLOPT_POSTFIELDS => $request->getContent(),
-			CURLOPT_HEADER => FALSE,
-			CURLOPT_HEADERFUNCTION => function($curl, $line) use (& $responseHeaders, & $last) {
-				if (strncasecmp($line, 'HTTP/', 5) === 0) {
-					/** @todo Set proxy response as Response::setPrevious($proxyResponse)? */
-					# The HTTP/x.y may occur multiple times with proxy (HTTP/1.1 200 Connection Established)
-					$responseHeaders = [];
-
-				} elseif (in_array(substr($line, 0, 1), [' ', "\t"], TRUE)) {
-					$responseHeaders[$last] .= ' ' . trim($line);  # RFC2616, 2.2
-
-				} elseif ($line !== "\r\n") {
-					list($name, $value) = explode(':', $line, 2);
-					$responseHeaders[$last = trim($name)] = trim($value);
-				}
-
-				return strlen($line);
-			},
-		];
-
-		if (defined('CURLOPT_PROTOCOLS')) {  # HHVM issue. Even cURL v7.26.0, constants are missing.
-			$hardOptions[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
-		}
-
-		if (!$this->curl) {
-			$this->curl = curl_init();
-			if ($this->curl === FALSE) {
-				throw new BadResponseException('Cannot init cURL handler.');
-			}
-		}
-
-		$result = curl_setopt_array($this->curl, $hardOptions + ($this->options ?: []) + $softOptions);
-		if ($result === FALSE) {
-			throw new BadResponseException('Setting cURL options failed: ' . curl_error($this->curl), curl_errno($this->curl));
-		}
-
-		$content = curl_exec($this->curl);
-		if ($content === FALSE) {
-			throw new BadResponseException(curl_error($this->curl), curl_errno($this->curl));
-		}
-
-		$code = curl_getinfo($this->curl, CURLINFO_HTTP_CODE);
-		if ($code === FALSE) {
-			throw new BadResponseException('HTTP status code is missing:' . curl_error($this->curl), curl_errno($this->curl));
-		}
-
-		return new Response($code, $responseHeaders, $content);
-	}
+    /** @var array|NULL */
+    private $options;
+
+    /** @var resource */
+    private $curl;
+
+
+    /**
+     * @param  array  cURL options {@link http://php.net/manual/en/function.curl-setopt.php}
+     *
+     * @throws Github\LogicException
+     */
+    public function __construct(array $options = NULL)
+    {
+        if (!extension_loaded('curl')) {
+            throw new Github\LogicException('cURL extension is not loaded.');
+        }
+
+        $this->options = $options;
+    }
+
+
+    protected function setupRequest(Request $request)
+    {
+        parent::setupRequest($request);
+        $request->addHeader('Connection', 'keep-alive');
+    }
+
+
+    /**
+     * @return Response
+     *
+     * @throws BadResponseException
+     */
+    protected function process(Request $request)
+    {
+        $headers = [];
+        foreach ($request->getHeaders() as $name => $value) {
+            $headers[] = "$name: $value";
+        }
+
+        $responseHeaders = [];
+        $softOptions = [
+            CURLOPT_CONNECTTIMEOUT => 10,
+            CURLOPT_SSL_VERIFYHOST => 2,
+            CURLOPT_SSL_VERIFYPEER => 1,
+            CURLOPT_CAINFO => realpath(__DIR__ . '/../ca-chain.crt'),
+        ];
+
+        $hardOptions = [
+            CURLOPT_FOLLOWLOCATION => FALSE, # Github sets the Location header for 201 code too and redirection is not required for us
+            CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
+            CURLOPT_CUSTOMREQUEST => $request->getMethod(),
+            CURLOPT_NOBODY => $request->isMethod(Request::HEAD),
+            CURLOPT_URL => $request->getUrl(),
+            CURLOPT_HTTPHEADER => $headers,
+            CURLOPT_RETURNTRANSFER => TRUE,
+            CURLOPT_POSTFIELDS => $request->getContent(),
+            CURLOPT_HEADER => FALSE,
+            CURLOPT_HEADERFUNCTION => function($curl, $line) use (& $responseHeaders, & $last) {
+                if (strncasecmp($line, 'HTTP/', 5) === 0) {
+                    /** @todo Set proxy response as Response::setPrevious($proxyResponse)? */
+                    # The HTTP/x.y may occur multiple times with proxy (HTTP/1.1 200 Connection Established)
+                    $responseHeaders = [];
+
+                } elseif (in_array(substr($line, 0, 1), [' ', "\t"], TRUE)) {
+                    $responseHeaders[$last] .= ' ' . trim($line);  # RFC2616, 2.2
+
+                } elseif ($line !== "\r\n") {
+                    list($name, $value) = explode(':', $line, 2);
+                    $responseHeaders[$last = trim($name)] = trim($value);
+                }
+
+                return strlen($line);
+            },
+        ];
+
+        if (defined('CURLOPT_PROTOCOLS')) {  # HHVM issue. Even cURL v7.26.0, constants are missing.
+            $hardOptions[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
+        }
+
+        if (!$this->curl) {
+            $this->curl = curl_init();
+            if ($this->curl === FALSE) {
+                throw new BadResponseException('Cannot init cURL handler.');
+            }
+        }
+
+        $result = curl_setopt_array($this->curl, $hardOptions + ($this->options ?: []) + $softOptions);
+        if ($result === FALSE) {
+            throw new BadResponseException('Setting cURL options failed: ' . curl_error($this->curl), curl_errno($this->curl));
+        }
+
+        $content = curl_exec($this->curl);
+        if ($content === FALSE) {
+            throw new BadResponseException(curl_error($this->curl), curl_errno($this->curl));
+        }
+
+        $code = curl_getinfo($this->curl, CURLINFO_HTTP_CODE);
+        if ($code === FALSE) {
+            throw new BadResponseException('HTTP status code is missing:' . curl_error($this->curl), curl_errno($this->curl));
+        }
+
+        return new Response($code, $responseHeaders, $content);
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -58,7 +58,7 @@ 
 			CURLOPT_CONNECTTIMEOUT => 10,
 			CURLOPT_SSL_VERIFYHOST => 2,
 			CURLOPT_SSL_VERIFYPEER => 1,
-			CURLOPT_CAINFO => realpath(__DIR__ . '/../ca-chain.crt'),
+			CURLOPT_CAINFO => realpath(__DIR__.'/../ca-chain.crt'),
 		];
 
 		$hardOptions = [
@@ -78,7 +78,7 @@ 
 					$responseHeaders = [];
 
 				} elseif (in_array(substr($line, 0, 1), [' ', "\t"], TRUE)) {
-					$responseHeaders[$last] .= ' ' . trim($line);  # RFC2616, 2.2
+					$responseHeaders[$last] .= ' '.trim($line); # RFC2616, 2.2
 
 				} elseif ($line !== "\r\n") {
 					list($name, $value) = explode(':', $line, 2);
@@ -102,7 +102,7 @@ 
 
 		$result = curl_setopt_array($this->curl, $hardOptions + ($this->options ?: []) + $softOptions);
 		if ($result === FALSE) {
-			throw new BadResponseException('Setting cURL options failed: ' . curl_error($this->curl), curl_errno($this->curl));
+			throw new BadResponseException('Setting cURL options failed: '.curl_error($this->curl), curl_errno($this->curl));
 		}
 
 		$content = curl_exec($this->curl);
@@ -112,7 +112,7 @@ 
 
 		$code = curl_getinfo($this->curl, CURLINFO_HTTP_CODE);
 		if ($code === FALSE) {
-			throw new BadResponseException('HTTP status code is missing:' . curl_error($this->curl), curl_errno($this->curl));
+			throw new BadResponseException('HTTP status code is missing:'.curl_error($this->curl), curl_errno($this->curl));
 		}
 
 		return new Response($code, $responseHeaders, $content);

class/Github/Http/Response.php

Indentation +75 added lines, -75 removed lines

@@ -12,80 +12,80 @@
  */
 class Response extends Message
 {
-	/** HTTP 1.1 code */
-	const
-		S200_OK = 200,
-		S301_MOVED_PERMANENTLY = 301,
-		S302_FOUND = 302,
-		S304_NOT_MODIFIED = 304,
-		S307_TEMPORARY_REDIRECT = 307,
-		S400_BAD_REQUEST = 400,
-		S401_UNAUTHORIZED = 401,
-		S403_FORBIDDEN = 403,
-		S404_NOT_FOUND = 404,
-		S422_UNPROCESSABLE_ENTITY = 422;
-
-	/** @var int */
-	private $code;
-
-	/** @var Response */
-	private $previous;
-
-
-	/**
-	 * @param  int
-	 * @param  array
-	 * @param  string
-	 */
-	public function __construct($code, array $headers, $content)
-	{
-		$this->code = (int) $code;
-		parent::__construct($headers, $content);
-	}
-
-
-	/**
-	 * HTTP code.
-	 * @return int
-	 */
-	public function getCode()
-	{
-		return $this->code;
-	}
-
-
-	/**
-	 * @param  int
-	 * @return bool
-	 */
-	public function isCode($code)
-	{
-		return $this->code === (int) $code;
-	}
-
-
-	/**
-	 * @return Response|NULL
-	 */
-	public function getPrevious()
-	{
-		return $this->previous;
-	}
-
-
-	/**
-	 * @return self
-	 *
-	 * @throws Github\LogicException
-	 */
-	public function setPrevious(Response $previous = NULL)
-	{
-		if ($this->previous) {
-			throw new Github\LogicException('Previous response is already set.');
-		}
-		$this->previous = $previous;
-
-		return $this;
-	}
+    /** HTTP 1.1 code */
+    const
+        S200_OK = 200,
+        S301_MOVED_PERMANENTLY = 301,
+        S302_FOUND = 302,
+        S304_NOT_MODIFIED = 304,
+        S307_TEMPORARY_REDIRECT = 307,
+        S400_BAD_REQUEST = 400,
+        S401_UNAUTHORIZED = 401,
+        S403_FORBIDDEN = 403,
+        S404_NOT_FOUND = 404,
+        S422_UNPROCESSABLE_ENTITY = 422;
+
+    /** @var int */
+    private $code;
+
+    /** @var Response */
+    private $previous;
+
+
+    /**
+     * @param  int
+     * @param  array
+     * @param  string
+     */
+    public function __construct($code, array $headers, $content)
+    {
+        $this->code = (int) $code;
+        parent::__construct($headers, $content);
+    }
+
+
+    /**
+     * HTTP code.
+     * @return int
+     */
+    public function getCode()
+    {
+        return $this->code;
+    }
+
+
+    /**
+     * @param  int
+     * @return bool
+     */
+    public function isCode($code)
+    {
+        return $this->code === (int) $code;
+    }
+
+
+    /**
+     * @return Response|NULL
+     */
+    public function getPrevious()
+    {
+        return $this->previous;
+    }
+
+
+    /**
+     * @return self
+     *
+     * @throws Github\LogicException
+     */
+    public function setPrevious(Response $previous = NULL)
+    {
+        if ($this->previous) {
+            throw new Github\LogicException('Previous response is already set.');
+        }
+        $this->previous = $previous;
+
+        return $this;
+    }
 
 }

class/Github/Http/AbstractClient.php

Indentation +93 added lines, -93 removed lines

@@ -12,98 +12,98 @@
  */
 abstract class AbstractClient extends Github\Sanity implements IClient
 {
-	/** @var int[]  will follow Location header on these response codes */
-	public $redirectCodes = [
-		Response::S301_MOVED_PERMANENTLY,
-		Response::S302_FOUND,
-		Response::S307_TEMPORARY_REDIRECT,
-	];
-
-	/** @var int  maximum redirects per request*/
-	public $maxRedirects = 5;
-
-	/** @var callable|NULL */
-	private $onRequest;
-
-	/** @var callable|NULL */
-	private $onResponse;
-
-
-	/**
-	 * @see https://developer.github.com/v3/#http-redirects
-	 *
-	 * @return Response
-	 *
-	 * @throws BadResponseException
-	 */
-	public function request(Request $request)
-	{
-		$request = clone $request;
-
-		$counter = $this->maxRedirects;
-		$previous = NULL;
-		do {
-			$this->setupRequest($request);
-
-			$this->onRequest && call_user_func($this->onRequest, $request);
-			$response = $this->process($request);
-			$this->onResponse && call_user_func($this->onResponse, $response);
-
-			$previous = $response->setPrevious($previous);
-
-			if ($counter > 0 && in_array($response->getCode(), $this->redirectCodes) && $response->hasHeader('Location')) {
-				/** @todo Use the same HTTP $method for redirection? Set $content to NULL? */
-				$request = new Request(
-					$request->getMethod(),
-					$response->getHeader('Location'),
-					$request->getHeaders(),
-					$request->getContent()
-				);
-
-				$counter--;
-				continue;
-			}
-			break;
-
-		} while (TRUE);
-
-		return $response;
-	}
-
-
-	/**
-	 * @param  callable|NULL function(Request $request)
-	 * @return self
-	 */
-	public function onRequest($callback)
-	{
-		$this->onRequest = $callback;
-		return $this;
-	}
-
-
-	/**
-	 * @param  callable|NULL function(Response $response)
-	 * @return self
-	 */
-	public function onResponse($callback)
-	{
-		$this->onResponse = $callback;
-		return $this;
-	}
-
-
-	protected function setupRequest(Request $request)
-	{
-		$request->addHeader('Expect', '');
-	}
-
-
-	/**
-	 * @return Response
-	 *
-	 * @throws BadResponseException
-	 */
-	abstract protected function process(Request $request);
+    /** @var int[]  will follow Location header on these response codes */
+    public $redirectCodes = [
+        Response::S301_MOVED_PERMANENTLY,
+        Response::S302_FOUND,
+        Response::S307_TEMPORARY_REDIRECT,
+    ];
+
+    /** @var int  maximum redirects per request*/
+    public $maxRedirects = 5;
+
+    /** @var callable|NULL */
+    private $onRequest;
+
+    /** @var callable|NULL */
+    private $onResponse;
+
+
+    /**
+     * @see https://developer.github.com/v3/#http-redirects
+     *
+     * @return Response
+     *
+     * @throws BadResponseException
+     */
+    public function request(Request $request)
+    {
+        $request = clone $request;
+
+        $counter = $this->maxRedirects;
+        $previous = NULL;
+        do {
+            $this->setupRequest($request);
+
+            $this->onRequest && call_user_func($this->onRequest, $request);
+            $response = $this->process($request);
+            $this->onResponse && call_user_func($this->onResponse, $response);
+
+            $previous = $response->setPrevious($previous);
+
+            if ($counter > 0 && in_array($response->getCode(), $this->redirectCodes) && $response->hasHeader('Location')) {
+                /** @todo Use the same HTTP $method for redirection? Set $content to NULL? */
+                $request = new Request(
+                    $request->getMethod(),
+                    $response->getHeader('Location'),
+                    $request->getHeaders(),
+                    $request->getContent()
+                );
+
+                $counter--;
+                continue;
+            }
+            break;
+
+        } while (TRUE);
+
+        return $response;
+    }
+
+
+    /**
+     * @param  callable|NULL function(Request $request)
+     * @return self
+     */
+    public function onRequest($callback)
+    {
+        $this->onRequest = $callback;
+        return $this;
+    }
+
+
+    /**
+     * @param  callable|NULL function(Response $response)
+     * @return self
+     */
+    public function onResponse($callback)
+    {
+        $this->onResponse = $callback;
+        return $this;
+    }
+
+
+    protected function setupRequest(Request $request)
+    {
+        $request->addHeader('Expect', '');
+    }
+
+
+    /**
+     * @return Response
+     *
+     * @throws BadResponseException
+     */
+    abstract protected function process(Request $request);
 
 }