ggoffy / wggithub

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);
 
 }

class/Github/Http/IClient.php

Indentation +14 added lines, -14 removed lines

@@ -10,21 +10,21 @@
  */
 interface IClient
 {
-	/**
-	 * @return Response
-	 */
-	function request(Request $request);
+    /**
+     * @return Response
+     */
+    function request(Request $request);
 
-	/**
-	 * @param  callable|NULL
-	 * @return self
-	 */
-	function onRequest($callback);
+    /**
+     * @param  callable|NULL
+     * @return self
+     */
+    function onRequest($callback);
 
-	/**
-	 * @param  callable|NULL
-	 * @return self
-	 */
-	function onResponse($callback);
+    /**
+     * @param  callable|NULL
+     * @return self
+     */
+    function onResponse($callback);
 
 }

class/Github/OAuth/Token.php

Indentation +92 added lines, -92 removed lines

@@ -12,97 +12,97 @@
  */
 class Token extends Github\Sanity
 {
-	/** @var string */
-	private $value;
-
-	/** @var string */
-	private $type;
-
-	/** @var string[] */
-	private $scopes;
-
-
-	/**
-	 * @param  string
-	 * @param  string
-	 * @param  string[]
-	 */
-	public function __construct($value, $type = '', array $scopes = [])
-	{
-		$this->value = $value;
-		$this->type = $type;
-		$this->scopes = $scopes;
-	}
-
-
-	/**
-	 * @return string
-	 */
-	public function getValue()
-	{
-		return $this->value;
-	}
-
-
-	/**
-	 * @return string
-	 */
-	public function getType()
-	{
-		return $this->type;
-	}
-
-
-	/**
-	 * @return string[]
-	 */
-	public function getScopes()
-	{
-		return $this->scopes;
-	}
-
-
-	/**
-	 * @see https://developer.github.com/v3/oauth/#scopes
-	 *
-	 * @param  string
-	 * @return bool
-	 */
-	public function hasScope($scope)
-	{
-		if (in_array($scope, $this->scopes, TRUE)) {
-			return TRUE;
-		}
-
-		static $superiors = [
-			'user:email' => 'user',
-			'user:follow' => 'user',
-			'notifications' => 'repo',
-		];
-
-		if (array_key_exists($scope, $superiors) && in_array($superiors[$scope], $this->scopes, TRUE)) {
-			return TRUE;
-		}
-
-		return FALSE;
-	}
-
-
-	/** @internal */
-	public function toArray()
-	{
-		return [
-			'value' => $this->value,
-			'type' => $this->type,
-			'scopes' => $this->scopes,
-		];
-	}
-
-
-	/** @internal */
-	public static function createFromArray(array $data)
-	{
-		return new static($data['value'], $data['type'], $data['scopes']);
-	}
+    /** @var string */
+    private $value;
+
+    /** @var string */
+    private $type;
+
+    /** @var string[] */
+    private $scopes;
+
+
+    /**
+     * @param  string
+     * @param  string
+     * @param  string[]
+     */
+    public function __construct($value, $type = '', array $scopes = [])
+    {
+        $this->value = $value;
+        $this->type = $type;
+        $this->scopes = $scopes;
+    }
+
+
+    /**
+     * @return string
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+
+    /**
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+
+    /**
+     * @return string[]
+     */
+    public function getScopes()
+    {
+        return $this->scopes;
+    }
+
+
+    /**
+     * @see https://developer.github.com/v3/oauth/#scopes
+     *
+     * @param  string
+     * @return bool
+     */
+    public function hasScope($scope)
+    {
+        if (in_array($scope, $this->scopes, TRUE)) {
+            return TRUE;
+        }
+
+        static $superiors = [
+            'user:email' => 'user',
+            'user:follow' => 'user',
+            'notifications' => 'repo',
+        ];
+
+        if (array_key_exists($scope, $superiors) && in_array($superiors[$scope], $this->scopes, TRUE)) {
+            return TRUE;
+        }
+
+        return FALSE;
+    }
+
+
+    /** @internal */
+    public function toArray()
+    {
+        return [
+            'value' => $this->value,
+            'type' => $this->type,
+            'scopes' => $this->scopes,
+        ];
+    }
+
+
+    /** @internal */
+    public static function createFromArray(array $data)
+    {
+        return new static($data['value'], $data['type'], $data['scopes']);
+    }
 
 }

class/Github/OAuth/Configuration.php

Indentation +27 added lines, -27 removed lines

@@ -12,35 +12,35 @@
  */
 class Configuration extends Github\Sanity
 {
-	/** @var string */
-	public $clientId;
-
-	/** @var string */
-	public $clientSecret;
-
-	/** @var string[] */
-	public $scopes;
-
-
-	/**
-	 * @param  string
-	 * @param  string
-	 * @param  string[]
-	 */
-	public function __construct($clientId, $clientSecret, array $scopes = [])
-	{
-		$this->clientId = $clientId;
-		$this->clientSecret = $clientSecret;
-		$this->scopes = $scopes;
+    /** @var string */
+    public $clientId;
+
+    /** @var string */
+    public $clientSecret;
+
+    /** @var string[] */
+    public $scopes;
+
+
+    /**
+     * @param  string
+     * @param  string
+     * @param  string[]
+     */
+    public function __construct($clientId, $clientSecret, array $scopes = [])
+    {
+        $this->clientId = $clientId;
+        $this->clientSecret = $clientSecret;
+        $this->scopes = $scopes;
     }
 
 
-	/**
-	 * @return Configuration
-	 */
-	public static function fromArray(array $conf)
-	{
-		return new static($conf['clientId'], $conf['clientSecret'], isset($conf['scopes']) ? $conf['scopes'] : []);
-	}
+    /**
+     * @return Configuration
+     */
+    public static function fromArray(array $conf)
+    {
+        return new static($conf['clientId'], $conf['clientSecret'], isset($conf['scopes']) ? $conf['scopes'] : []);
+    }
 
 }

class/Github/OAuth/Login.php

Indentation +153 added lines, -153 removed lines

@@ -14,158 +14,158 @@
  */
 class Login extends Github\Sanity
 {
-	/** @var string */
-	private $authUrl = 'https://github.com/login/oauth/authorize';
-
-	/** @var string */
-	private $tokenUrl = 'https://github.com/login/oauth/access_token';
-
-	/** @var Configuration */
-	private $conf;
-
-	/** @var Storages\ISessionStorage */
-	private $storage;
-
-	/** @var Http\IClient */
-	private $client;
-
-
-	public function __construct(Configuration $conf, Storages\ISessionStorage $storage = NULL, Http\IClient $client = NULL)
-	{
-		$this->conf = $conf;
-		$this->storage = $storage ?: new Storages\SessionStorage;
-		$this->client = $client ?: Github\Helpers::createDefaultClient();
-	}
-
-
-	/**
-	 * @return Http\IClient
-	 */
-	public function getClient()
-	{
-		return $this->client;
-	}
-
-
-	/**
-	 * @param  string  URL to redirect back from Github when user approves the permissions request
-	 * @param  callable function($githubUrl)  makes HTTP redirect to Github
-	 */
-	public function askPermissions($backUrl, $redirectCb = NULL)
-	{
-		/** @todo Something more safe? */
-		$state = sha1(uniqid(microtime(TRUE), TRUE));
-		$params = [
-			'client_id' => $this->conf->clientId,
-			'redirect_uri' => $backUrl,
-			'scope' => implode(',', $this->conf->scopes),
-			'state' => $state,
-		];
-
-		$this->storage->set('auth.state', $state);
-
-		$url = $this->authUrl . '?' . http_build_query($params);
-		if ($redirectCb === NULL) {
-			header("Location: $url");
-			die();
-		} else {
-			call_user_func($redirectCb, $url);
-		}
-	}
-
-
-	/**
-	 * @param  string
-	 * @param  string
-	 * @return Token
-	 *
-	 * @throws LoginException
-	 */
-	public function obtainToken($code, $state)
-	{
-		if ($state !== $this->storage->get('auth.state')) {
-			throw new LoginException('OAuth security state does not match.');
-		}
-
-		$params = [
-			'client_id' => $this->conf->clientId,
-			'client_secret' => $this->conf->clientSecret,
-			'code' => $code,
-		];
-
-		$headers = [
-			'Accept' => 'application/json',
-			'Content-Type' => 'application/x-www-form-urlencoded',
-		];
-
-		$request = new Http\Request(Http\Request::POST, $this->tokenUrl, $headers, http_build_query($params));
-		try {
-			$response = $this->client->request($request);
-		} catch (Http\BadResponseException $e) {
-			throw new LoginException('HTTP request failed.', 0, $e);
-		}
-
-		try {
-			/** @var $json \stdClass */
-			if ($response->isCode(Http\Response::S404_NOT_FOUND)) {
-				$json = Github\Helpers::jsonDecode($response->getContent());
-				throw new LoginException($json->error, $response->getCode());
-
-			} elseif (!$response->isCode(Http\Response::S200_OK)) {
-				throw new LoginException('Unexpected response.', $response->getCode());
-			}
-
-			$json = Github\Helpers::jsonDecode($response->getContent());
-
-		} catch (Github\JsonException $e) {
-			throw new LoginException('Bad JSON in response.', 0, $e);
-		}
-
-		$token = new Token($json->access_token, $json->token_type, strlen($json->scope) ? explode(',', $json->scope) : []);
-		$this->storage->set('auth.token', $token->toArray());
-		$this->storage->remove('auth.state');
-
-		return $token;
-	}
-
-
-	/**
-	 * @return bool
-	 */
-	public function hasToken()
-	{
-		return $this->storage->get('auth.token') !== NULL;
-	}
-
-
-	/**
-	 * @return Token
-	 *
-	 * @throws Github\LogicException  when token has not been obtained yet
-	 */
-	public function getToken()
-	{
-		$token = $this->storage->get('auth.token');
-		if ($token === NULL) {
-			throw new Github\LogicException('Token has not been obtained yet.');
-
-		} elseif ($token instanceof Token) {
-			/** @deprecated */
-			$token = $token->toArray();
-			$this->storage->set('auth.token', $token);
-		}
-
-		return Token::createFromArray($token);
-	}
-
-
-	/**
-	 * @return self
-	 */
-	public function dropToken()
-	{
-		$this->storage->remove('auth.token');
-		return $this;
-	}
+    /** @var string */
+    private $authUrl = 'https://github.com/login/oauth/authorize';
+
+    /** @var string */
+    private $tokenUrl = 'https://github.com/login/oauth/access_token';
+
+    /** @var Configuration */
+    private $conf;
+
+    /** @var Storages\ISessionStorage */
+    private $storage;
+
+    /** @var Http\IClient */
+    private $client;
+
+
+    public function __construct(Configuration $conf, Storages\ISessionStorage $storage = NULL, Http\IClient $client = NULL)
+    {
+        $this->conf = $conf;
+        $this->storage = $storage ?: new Storages\SessionStorage;
+        $this->client = $client ?: Github\Helpers::createDefaultClient();
+    }
+
+
+    /**
+     * @return Http\IClient
+     */
+    public function getClient()
+    {
+        return $this->client;
+    }
+
+
+    /**
+     * @param  string  URL to redirect back from Github when user approves the permissions request
+     * @param  callable function($githubUrl)  makes HTTP redirect to Github
+     */
+    public function askPermissions($backUrl, $redirectCb = NULL)
+    {
+        /** @todo Something more safe? */
+        $state = sha1(uniqid(microtime(TRUE), TRUE));
+        $params = [
+            'client_id' => $this->conf->clientId,
+            'redirect_uri' => $backUrl,
+            'scope' => implode(',', $this->conf->scopes),
+            'state' => $state,
+        ];
+
+        $this->storage->set('auth.state', $state);
+
+        $url = $this->authUrl . '?' . http_build_query($params);
+        if ($redirectCb === NULL) {
+            header("Location: $url");
+            die();
+        } else {
+            call_user_func($redirectCb, $url);
+        }
+    }
+
+
+    /**
+     * @param  string
+     * @param  string
+     * @return Token
+     *
+     * @throws LoginException
+     */
+    public function obtainToken($code, $state)
+    {
+        if ($state !== $this->storage->get('auth.state')) {
+            throw new LoginException('OAuth security state does not match.');
+        }
+
+        $params = [
+            'client_id' => $this->conf->clientId,
+            'client_secret' => $this->conf->clientSecret,
+            'code' => $code,
+        ];
+
+        $headers = [
+            'Accept' => 'application/json',
+            'Content-Type' => 'application/x-www-form-urlencoded',
+        ];
+
+        $request = new Http\Request(Http\Request::POST, $this->tokenUrl, $headers, http_build_query($params));
+        try {
+            $response = $this->client->request($request);
+        } catch (Http\BadResponseException $e) {
+            throw new LoginException('HTTP request failed.', 0, $e);
+        }
+
+        try {
+            /** @var $json \stdClass */
+            if ($response->isCode(Http\Response::S404_NOT_FOUND)) {
+                $json = Github\Helpers::jsonDecode($response->getContent());
+                throw new LoginException($json->error, $response->getCode());
+
+            } elseif (!$response->isCode(Http\Response::S200_OK)) {
+                throw new LoginException('Unexpected response.', $response->getCode());
+            }
+
+            $json = Github\Helpers::jsonDecode($response->getContent());
+
+        } catch (Github\JsonException $e) {
+            throw new LoginException('Bad JSON in response.', 0, $e);
+        }
+
+        $token = new Token($json->access_token, $json->token_type, strlen($json->scope) ? explode(',', $json->scope) : []);
+        $this->storage->set('auth.token', $token->toArray());
+        $this->storage->remove('auth.state');
+
+        return $token;
+    }
+
+
+    /**
+     * @return bool
+     */
+    public function hasToken()
+    {
+        return $this->storage->get('auth.token') !== NULL;
+    }
+
+
+    /**
+     * @return Token
+     *
+     * @throws Github\LogicException  when token has not been obtained yet
+     */
+    public function getToken()
+    {
+        $token = $this->storage->get('auth.token');
+        if ($token === NULL) {
+            throw new Github\LogicException('Token has not been obtained yet.');
+
+        } elseif ($token instanceof Token) {
+            /** @deprecated */
+            $token = $token->toArray();
+            $this->storage->set('auth.token', $token);
+        }
+
+        return Token::createFromArray($token);
+    }
+
+
+    /**
+     * @return self
+     */
+    public function dropToken()
+    {
+        $this->storage->remove('auth.token');
+        return $this;
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 
 		$this->storage->set('auth.state', $state);
 
-		$url = $this->authUrl . '?' . http_build_query($params);
+		$url = $this->authUrl.'?'.http_build_query($params);
 		if ($redirectCb === NULL) {
 			header("Location: $url");
 			die();

class/Github/Storages/FileCache.php

Indentation +81 added lines, -81 removed lines

@@ -12,86 +12,86 @@
  */
 class FileCache extends Github\Sanity implements ICache
 {
-	/** @var string */
-	private $dir;
-
-
-	/**
-	 * @param  string  temporary directory
-	 *
-	 * @throws MissingDirectoryException
-	 */
-	public function __construct($tempDir)
-	{
-		if (!is_dir($tempDir)) {
-			throw new MissingDirectoryException("Directory '$tempDir' is missing.");
-		}
-
-		$dir = $tempDir . DIRECTORY_SEPARATOR . 'milo.github-api';
-
-		if (!is_dir($dir)) {
-			set_error_handler(function($severity, $message, $file, $line) use ($dir, & $valid) {
-				restore_error_handler();
-				if (!is_dir($dir)) {
-					throw new MissingDirectoryException("Cannot create '$dir' directory.", 0, new \ErrorException($message, 0, $severity, $file, $line));
-				}
-			});
-			mkdir($dir);
-			restore_error_handler();
-		}
-
-		$this->dir = $dir;
-	}
-
-
-	/**
-	 * @param  string
-	 * @param  mixed
-	 * @return mixed  stored value
-	 */
-	public function save($key, $value)
-	{
-		file_put_contents(
-			$this->filePath($key),
-			serialize($value),
-			LOCK_EX
-		);
-
-		return $value;
-	}
-
-
-	/**
-	 * @param  string
-	 * @return mixed|NULL
-	 */
-	public function load($key)
-	{
-		$path = $this->filePath($key);
-		if (is_file($path) && ($fd = fopen($path, 'rb')) && flock($fd, LOCK_SH)) {
-			$cached = stream_get_contents($fd);
-			flock($fd, LOCK_UN);
-			fclose($fd);
-
-			$success = TRUE;
-			set_error_handler(function() use (& $success) { return $success = FALSE; }, E_NOTICE);
-			$cached = unserialize($cached);
-			restore_error_handler();
-
-			if ($success) {
-				return $cached;
-			}
-		}
-	}
-
-
-	/**
-	 * @param  string
-	 * @return string
-	 */
-	private function filePath($key)
-	{
-		return $this->dir . DIRECTORY_SEPARATOR . sha1($key) . '.php';
-	}
+    /** @var string */
+    private $dir;
+
+
+    /**
+     * @param  string  temporary directory
+     *
+     * @throws MissingDirectoryException
+     */
+    public function __construct($tempDir)
+    {
+        if (!is_dir($tempDir)) {
+            throw new MissingDirectoryException("Directory '$tempDir' is missing.");
+        }
+
+        $dir = $tempDir . DIRECTORY_SEPARATOR . 'milo.github-api';
+
+        if (!is_dir($dir)) {
+            set_error_handler(function($severity, $message, $file, $line) use ($dir, & $valid) {
+                restore_error_handler();
+                if (!is_dir($dir)) {
+                    throw new MissingDirectoryException("Cannot create '$dir' directory.", 0, new \ErrorException($message, 0, $severity, $file, $line));
+                }
+            });
+            mkdir($dir);
+            restore_error_handler();
+        }
+
+        $this->dir = $dir;
+    }
+
+
+    /**
+     * @param  string
+     * @param  mixed
+     * @return mixed  stored value
+     */
+    public function save($key, $value)
+    {
+        file_put_contents(
+            $this->filePath($key),
+            serialize($value),
+            LOCK_EX
+        );
+
+        return $value;
+    }
+
+
+    /**
+     * @param  string
+     * @return mixed|NULL
+     */
+    public function load($key)
+    {
+        $path = $this->filePath($key);
+        if (is_file($path) && ($fd = fopen($path, 'rb')) && flock($fd, LOCK_SH)) {
+            $cached = stream_get_contents($fd);
+            flock($fd, LOCK_UN);
+            fclose($fd);
+
+            $success = TRUE;
+            set_error_handler(function() use (& $success) { return $success = FALSE; }, E_NOTICE);
+            $cached = unserialize($cached);
+            restore_error_handler();
+
+            if ($success) {
+                return $cached;
+            }
+        }
+    }
+
+
+    /**
+     * @param  string
+     * @return string
+     */
+    private function filePath($key)
+    {
+        return $this->dir . DIRECTORY_SEPARATOR . sha1($key) . '.php';
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 			throw new MissingDirectoryException("Directory '$tempDir' is missing.");
 		}
 
-		$dir = $tempDir . DIRECTORY_SEPARATOR . 'milo.github-api';
+		$dir = $tempDir.DIRECTORY_SEPARATOR.'milo.github-api';
 
 		if (!is_dir($dir)) {
 			set_error_handler(function($severity, $message, $file, $line) use ($dir, & $valid) {
@@ -91,7 +91,7 @@ 
 	 */
 	private function filePath($key)
 	{
-		return $this->dir . DIRECTORY_SEPARATOR . sha1($key) . '.php';
+		return $this->dir.DIRECTORY_SEPARATOR.sha1($key).'.php';
 	}
 
 }