Merge branch 'master' into patch-2

# Conflicts:
#	lib/Github/Api/Repository/Comments.php

Author: bobeagan

CHANGELOG.md

@@ -2,11 +2,21 @@
 
 The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release. 
 
-## 2.0.2
+## 2.1.0
+
+### Added
+
+- Add support for retrieving a single notification info using his ID 
+- Add a function to get user organizations
+- Added GraphQL support
+- Add page variable to organization repo list (Organization::repositories())
+- Add support for pull request review. 
+- Add support for adding branch protection.
 
 ### Fixed
 
 - Bug with double slashes when using enterprise URL. 
+- Bug when headers not being passed to request (#529)
 
 ## 2.0.0
 

doc/README.md

@@ -12,8 +12,14 @@ APIs:
   * [Comments](gists/comments.md)
 * [Integrations](integrations.md)
 * [Issues](issues.md)
+  * [Assignees](issue/assignees.md)
   * [Comments](issue/comments.md)
   * [Labels](issue/labels.md)
+  * [Milestones](issue/milestones.md)
+* Miscellaneous
+  * [Emojis](miscellaneous/emojis.md)
+  * [Gitignore](miscellaneous/gitignore.md)
+  * [Markdown](miscellaneous/markdown.md)
 * [Organization](organization.md)
   * [Members](organization/members.md)
   * [Teams](organization/teams.md)
@@ -42,3 +48,4 @@ Additional features:
 * [Request any Route](request_any_route.md)
 * [Customize `php-github-api`](customize.md)
 * [Running and writing tests](testing.md)
+* [Request / Response info](request_response_info.md)

doc/issue/assignees.md

@@ -0,0 +1,28 @@
+## Issues / Assignees API
+[Back to the "Issues API"](../issues.md) | [Back to the navigation](../README.md)
+
+Wraps [GitHub Issue Assignees API](https://developer.github.com/v3/issues/assignees/).
+
+### List all available assignees
+
+```php
+$assignees = $client->api('issue')->assignees()->listAvailable('KnpLabs', 'php-github-api');
+```
+
+### Check if a user is an available assignee
+
+```php
+$info = $client->api('issue')->assignees()->check('KnpLabs', 'php-github-api', 'test-user);
+```
+
+### Add assignee
+
+```php
+$client->api('issue')->assignees()->add('KnpLabs', 'php-github-api', 4, ['assignees' => 'test-user]);
+```
+
+### Remove assignee
+
+```php
+$client->api('issue')->assignees()->remove('KnpLabs', 'php-github-api', 4, ['assignees' => 'test-user]);
+```

doc/issue/labels.md

@@ -12,6 +12,12 @@ $labels = $client->api('issue')->labels()->all('KnpLabs', 'php-github-api');
 List all project labels by username and repo.
 Returns an array of project labels.
 
+### Get a single label
+
+```php
+$label = $client->api('issue')->labels()->all('KnpLabs', 'php-github-api', 'label1');
+```
+
 ### Create a label
 
 ```php

doc/issues.md

@@ -84,3 +84,15 @@ $client->api('issue')->all('KnpLabs', 'php-github-api', array('labels' => 'label
 ```
 
 Returns an array of issues matching the given label.
+
+### Lock an issue discussion
+
+```php
+$client->api('issue')->lock('KnpLabs', 'php-github-api', 4);
+```
+
+### Unlock an issue discussion
+
+```php
+$client->api('issue')->unlock('KnpLabs', 'php-github-api', 4);
+```

doc/miscellaneous/emojis.md

@@ -0,0 +1,8 @@
+## Emojis API
+[Back to the navigation](../README.md)
+
+### Lists all available emojis on GitHub.
+
+```php
+$emojis = $client->api('emojis')->all();
+```

doc/miscellaneous/gitignore.md

@@ -0,0 +1,14 @@
+## Gitignore API
+[Back to the navigation](../README.md)
+
+### Lists all available gitignore templates
+
+```php
+$gitignoreTemplates = $client->api('gitignore')->all();
+```
+
+### Get a single template
+
+```php
+$gitignore = $client->api('gitignore')->show('C');
+```

doc/miscellaneous/markdown.md

@@ -0,0 +1,14 @@
+## Markdown API
+[Back to the navigation](../README.md)
+
+### Render an arbitrary Markdown document
+
+```php
+$gitignoreTemplates = $client->api('markdown')->render('Hello world github/linguist#1 **cool**, and #1!', 'markdown');
+```
+
+### Render a Markdown document in raw mode
+
+```php
+$gitignore = $client->api('markdown')->renderRaw('path/to/file');
+```

doc/pull_request/review_request.md

@@ -0,0 +1,27 @@
+## Pull Requests / Review Requests API
+[Back to the "Pull Requests API"](../pull_requests.md) | [Back to the navigation](../README.md)
+
+The Pull Request Review API is currently available for developers to preview.
+To access the API during the preview period, you must provide a custom media type in the Accept header:
+
+```php
+$client->api('pull_request')->reviewRequests()->configure();
+```
+
+### List all review requests
+
+```php
+$reviewRequests = $client->api('pull_request')->reviewRequests()->all('twbs', 'bootstrap', 12);
+```
+
+### Create a review request
+
+```php
+$client->api('pull_request')->reviewRequests()->create('twbs', 'bootstrap', 12, array('user1', 'user2'));
+```
+
+### Remove a review request
+
+```php
+$client->api('pull_request')->reviewRequests()->remove('twbs', 'bootstrap', 12, array('user1', 'user2'));
+```

doc/request_response_info.md

@@ -0,0 +1,14 @@
+## Request / Response information
+[Back to the navigation](README.md)
+
+### Get response headers
+
+Get the repsonse header for the latest request
+
+```
+$headers = $githubClient->getLastResponse()->getHeaders();
+//Example headers
+$headers['X-RateLimit-Remaining'];
+$headers['X-OAuth-Scopes'];
+$headers['X-Accepted-OAuth-Scopes'];
+```

lib/Github/Api/CurrentUser.php

@@ -112,7 +112,7 @@ public function teams()
      *
      * @param string $type      role in the repository
      * @param string $sort      sort by
-     * @param string $direction direction of sort, ask or desc
+     * @param string $direction direction of sort, asc or desc
      *
      * @return array
      */

lib/Github/Api/GitData/Blobs.php

@@ -19,12 +19,16 @@ class Blobs extends AbstractApi
      * Configure the Accept header depending on the blob type.
      *
      * @param string|null $bodyType
+     *
+     * @return self
      */
     public function configure($bodyType = null)
     {
         if ('raw' === $bodyType) {
             $this->acceptHeaderValue = sprintf('application/vnd.github.%s.raw', $this->client->getApiVersion());
         }
+
+        return $this;
     }
 
     /**

lib/Github/Api/Issue.php

@@ -2,6 +2,7 @@
 
 namespace Github\Api;
 
+use Github\Api\Issue\Assignees;
 use Github\Api\Issue\Comments;
 use Github\Api\Issue\Events;
 use Github\Api\Issue\Labels;
@@ -149,6 +150,38 @@ public function update($username, $repository, $id, array $params)
         return $this->patch('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/issues/'.rawurlencode($id), $params);
     }
 
+    /**
+     * Lock an issue. Users with push access can lock an issue's conversation.
+     *
+     * @link https://developer.github.com/v3/issues/#lock-an-issue
+     *
+     * @param string $username
+     * @param string $repository
+     * @param string $id
+     *
+     * @return string
+     */
+    public function lock($username, $repository, $id)
+    {
+        return $this->put('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/issues/'.rawurlencode($id).'/lock');
+    }
+
+    /**
+     * Unlock an issue. Users with push access can unlock an issue's conversation.
+     *
+     * @link https://developer.github.com/v3/issues/#lock-an-issue
+     *
+     * @param string $username
+     * @param string $repository
+     * @param string $id
+     *
+     * @return string
+     */
+    public function unlock($username, $repository, $id)
+    {
+        return $this->delete('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/issues/'.rawurlencode($id).'/lock');
+    }
+
     /**
      * List an issue comments.
      *
@@ -196,4 +229,16 @@ public function milestones()
     {
         return new Milestones($this->client);
     }
+
+    /**
+     * List all assignees.
+     *
+     * @link https://developer.github.com/v3/issues/assignees/
+     *
+     * @return Assignees
+     */
+    public function assignees()
+    {
+        return new Assignees($this->client);
+    }
 }

lib/Github/Api/Issue/Assignees.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace Github\Api\Issue;
+
+use Github\Api\AbstractApi;
+use Github\Exception\MissingArgumentException;
+
+class Assignees extends AbstractApi
+{
+    /**
+     * List all the available assignees to which issues may be assigned.
+     *
+     * @param string $username
+     * @param string $repository
+     * @param array  $parameters
+     *
+     * @return array
+     */
+    public function listAvailable($username, $repository, array $parameters = array())
+    {
+        return $this->get('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/assignees', $parameters);
+    }
+
+    /**
+     * Check to see if a particular user is an assignee for a repository.
+     *
+     * @link https://developer.github.com/v3/issues/assignees/#check-assignee
+     *
+     * @param string $username
+     * @param string $repository
+     * @param string $assignee
+     *
+     * @return array
+     */
+    public function check($username, $repository, $assignee)
+    {
+        return $this->get('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/assignees/' . rawurlencode($assignee));
+    }
+
+    /**
+     * Add assignees to an Issue
+     *
+     * @link https://developer.github.com/v3/issues/assignees/#add-assignees-to-an-issue
+     *
+     * @param string $username
+     * @param string $repository
+     * @param string $issue
+     * @param array  $parameters
+     *
+     * @return string
+     * @throws MissingArgumentException
+     */
+    public function add($username, $repository, $issue, array $parameters)
+    {
+        if (!isset($parameters['assignees'])) {
+            throw new MissingArgumentException('assignees');
+        }
+
+        return $this->post('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/issues/'.rawurlencode($issue).'/assignees', $parameters);
+    }
+
+    /**
+     * Remove assignees from an Issue
+     *
+     * @link https://developer.github.com/v3/issues/assignees/#remove-assignees-from-an-issue
+     *
+     * @param string $username
+     * @param string $repository
+     * @param string $issue
+     * @param array  $parameters
+     *
+     * @return string
+     * @throws MissingArgumentException
+     */
+    public function remove($username, $repository, $issue, array $parameters)
+    {
+        if (!isset($parameters['assignees'])) {
+            throw new MissingArgumentException('assignees');
+        }
+
+        return $this->delete('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/issues/'.rawurlencode($issue).'/assignees', $parameters);
+    }
+}

lib/Github/Api/Issue/Comments.php

@@ -20,6 +20,8 @@ class Comments extends AbstractApi
      *
      * @link https://developer.github.com/v3/issues/comments/#custom-media-types
      * @param string|null $bodyType
+     *
+     * @return self
      */
     public function configure($bodyType = null)
     {
@@ -28,6 +30,8 @@ public function configure($bodyType = null)
         }
 
         $this->acceptHeaderValue = sprintf('application/vnd.github.%s.%s+json', $this->client->getApiVersion(), $bodyType);
+
+        return $this;
     }
 
     /**

lib/Github/Api/Issue/Labels.php

@@ -33,6 +33,22 @@ public function all($username, $repository, $issue = null)
         return $this->get($path);
     }
 
+    /**
+     * Get a single label.
+     *
+     * @link https://developer.github.com/v3/issues/labels/#get-a-single-label
+     *
+     * @param string $username
+     * @param string $repository
+     * @param string $label
+     *
+     * @return array
+     */
+    public function show($username, $repository, $label)
+    {
+        return $this->get('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/labels/'.rawurlencode($label));
+    }
+
     /**
      * Create a label for a repository.
      *