Merge branch '2.x'

* 2.x:
  Update branch alias
  Fixed incorrect parameters in apps docs
  Fix incorrect public key documentation
  Add missing repo hooks documentation
  Replace deprecated organization team repository add/remove urls

Author: acrobat

composer.json

@@ -50,7 +50,7 @@
     "extra": {
         "branch-alias": {
             "dev-2.x": "2.19.x-dev",
-            "dev-master": "3.1.x-dev"
+            "dev-master": "3.2.x-dev"
         }
     }
 }

doc/apps.md

@@ -31,23 +31,21 @@ $installations = $client->api('current_user')->installations();
 
 List repositories that are accessible to the authenticated installation.
 ```php
-$repositories = $client->api('apps')->listRepositories(456);
+$repositories = $client->api('apps')->listRepositories($userId);
 ```
 
 ### List repositories for a given installation and user
 
 ```php
-$repositories = $client->api('current_user')->repositoriesByInstallation(456);
+$repositories = $client->api('current_user')->repositoriesByInstallation($installationId, $parameters);
 ```
 
 ### Add repository to installation
-Add a single repository to an installation.
 ```php
-$client->api('apps')->addRepository(123);
+$client->api('apps')->addRepository($installationId, $repositoryId);
 ```
 
 ### Remove repository from installation
-Remove a single repository from an installation.
 ```php
-$client->api('apps')->removeRepository(123);
+$client->api('apps')->removeRepository($installationId, $repositoryId);
 ```

doc/currentuser/publickeys.md

@@ -6,23 +6,23 @@ Wraps [GitHub User Public Keys API](https://developer.github.com/v3/users/keys/#
 ### List your public keys
 
 ```php
-$keys = $client->user()->keys()->all();
+$keys = $client->me()->keys()->all();
 ```
 
 Returns a list of public keys for the authenticated user.
 
 ### Shows a public key for the authenticated user.
 
 ```php
-$key = $client->user()->keys()->show(1234);
+$key = $client->me()->keys()->show(1234);
 ```
 
 ### Add a public key to the authenticated user.
 
 > Requires [authentication](../security.md).
 
 ```php
-$key = $client->user()->keys()->create(array('title' => 'key title', 'key' => 12345));
+$key = $client->me()->keys()->create(array('title' => 'key title', 'key' => 12345));
 ```
 
 Adds a key with title 'key title' to the authenticated user and returns a the created key for the user.
@@ -32,5 +32,5 @@ Adds a key with title 'key title' to the authenticated user and returns a the cr
 > Requires [authentication](../security.md).
 
 ```php
-$client->user()->keys()->remove(12345);
+$client->me()->keys()->remove(12345);
 ```

doc/repo/hooks.md

@@ -0,0 +1,46 @@
+## Repo / Hooks API
+[Back to the "Repos API"](../repos.md) | [Back to the navigation](../README.md)
+
+For extended info see the [Github documentation](https://docs.github.com/en/rest/reference/repos#webhooks)
+
+### List repository webhooks
+
+```php
+$hooks = $client->api('repo')->hooks()->all('twbs', 'bootstrap');
+```
+
+### Get a repository webhook
+
+```php
+$hook = $client->api('repo')->hooks()->show('twbs', 'bootstrap', $hookId);
+```
+
+### Create a repository webhook
+
+```php
+$client->api('repo')->hooks()->create('twbs', 'bootstrap', $parameters);
+```
+
+### Update a repository webhook
+
+```php
+$client->api('repo')->hooks()->update('twbs', 'bootstrap', $hookId, $parameters);
+```
+
+### Delete a repository webhook
+
+```php
+$client->api('repo')->hooks()->remove('twbs', 'bootstrap', $hookId);
+```
+
+### Ping a repository webhook
+
+```php
+$client->api('repo')->hooks()->ping('twbs', 'bootstrap', $hookId);
+```
+
+### Test the push repository webhook
+
+```php
+$client->api('repo')->hooks()->test('twbs', 'bootstrap', $hookId);
+```

lib/Github/Api/Organization/Teams.php

@@ -107,15 +107,15 @@ public function repository($team, $organization, $repository)
 
     public function addRepository($team, $organization, $repository, $params = [])
     {
-        if (isset($params['permission']) && !in_array($params['permission'], ['pull', 'push', 'admin'])) {
+        if (isset($params['permission']) && !in_array($params['permission'], ['pull', 'push', 'admin', 'maintain', 'triage'])) {
             $params['permission'] = 'pull';
         }
 
-        return $this->put('/teams/'.rawurlencode($team).'/repos/'.rawurlencode($organization).'/'.rawurlencode($repository), $params);
+        return $this->put('/orgs/'.rawurlencode($organization).'/teams/'.rawurlencode($team).'/repos/'.rawurlencode($organization).'/'.rawurlencode($repository), $params);
     }
 
     public function removeRepository($team, $organization, $repository)
     {
-        return $this->delete('/teams/'.rawurlencode($team).'/repos/'.rawurlencode($organization).'/'.rawurlencode($repository));
+        return $this->delete('/orgs/'.rawurlencode($organization).'/teams/'.rawurlencode($team).'/repos/'.rawurlencode($organization).'/'.rawurlencode($repository));
     }
 }

test/Github/Tests/Api/Organization/TeamsTest.php

@@ -161,7 +161,7 @@ public function shouldAddTeamRepository()
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('put')
-            ->with('/teams/KnpWorld/repos/l3l0/l3l0Repo')
+            ->with('/orgs/l3l0/teams/KnpWorld/repos/l3l0/l3l0Repo')
             ->will($this->returnValue($expectedValue));
 
         $this->assertEquals($expectedValue, $api->addRepository('KnpWorld', 'l3l0', 'l3l0Repo'));
@@ -177,7 +177,7 @@ public function shouldRemoveTeamRepository()
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('delete')
-            ->with('/teams/KnpWorld/repos/l3l0/l3l0Repo')
+            ->with('/orgs/l3l0/teams/KnpWorld/repos/l3l0/l3l0Repo')
             ->will($this->returnValue($expectedValue));
 
         $this->assertEquals($expectedValue, $api->removeRepository('KnpWorld', 'l3l0', 'l3l0Repo'));