Merge branch '2.x'

* 2.x:
  feature #894 Show user by ID (genintho)
  Don't urlencode integer values
  Fixed incorrect MissingArgumentException parent constructor values
  Removed shadow-cat
  minor #892 Don't use deprecated auth in examples (GrahamCampbell)
  Fix broken roave/bc-check test
  Update branch alias

Author: acrobat

.github/bc-test.sh

@@ -18,9 +18,9 @@ php:
 
 matrix:
   include:
-    - php: 7.2
+    - php: 7.4.7
       name: Backward compatibillity check
-      env: DEPENDENCIES="roave/backward-compatibility-check" TEST_COMMAND="./.github/bc-test.sh"
+      env: DEPENDENCIES="roave/backward-compatibility-check" TEST_COMMAND="vendor/bin/roave-backward-compatibility-check"
     - php: 7.4
       name: phpstan
       script:

.travis.yml

@@ -44,7 +44,7 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0.x-dev"
+            "dev-2.x": "3.0.x-dev"
         }
     }
 }

composer.json

@@ -25,6 +25,6 @@ There are three values that can be passed into the `repositories` method: `type`
 
 ```php
 $client = new \Github\Client(); 
-$client->authenticate($github_token, null, \Github\Client::AUTH_HTTP_TOKEN);
+$client->authenticate($github_token, null, \Github\Client::AUTH_ACCESS_TOKEN);
 $client->currentUser()->repositories();
 ```

doc/currentuser/repositories.md

@@ -51,11 +51,11 @@ Note however that GitHub describes this method as deprecated. In most case you s
 ### Authenticating as an Integration
 
 To authenticate as an integration you need to supply a JSON Web Token with `Github\Client::AUTH_JWT` to request
-and installation access token which is then usable with `Github\Client::AUTH_HTTP_TOKEN`. [Github´s integration
+and installation access token which is then usable with `Github\Client::AUTH_ACCESS_TOKEN`. [Github´s integration
 authentication docs](https://developer.github.com/apps/building-github-apps/authentication-options-for-github-apps/#authenticating-as-a-github-app) describe the flow in detail.
 It´s important for integration requests to use the custom Accept header `application/vnd.github.machine-man-preview`.
 
-The following sample code authenticates as an installation using [lcobucci/jwt](https://github.com/lcobucci/jwt/tree/3.2.0)
+The following sample code authenticates as an installation using [lcobucci/jwt](https://github.com/lcobucci/jwt/tree/3.3.2)
 to generate a JSON Web Token (JWT).
 
 ```php
@@ -78,7 +78,7 @@ $jwt = (new Builder)
 $github->authenticate($jwt, null, Github\Client::AUTH_JWT);
 
 $token = $github->api('apps')->createInstallationToken($installationId);
-$github->authenticate($token['token'], null, Github\Client::AUTH_HTTP_TOKEN);
+$github->authenticate($token['token'], null, Github\Client::AUTH_ACCESS_TOKEN);
 ```
 
 The `$integrationId` you can find in the about section of your github app.

doc/security.md

@@ -36,6 +36,13 @@ $user = $client->api('user')->show('KnpLabs');
 
 Returns an array of information about the user.
 
+
+You can also use the User ID, but it will use an undocumented Github API
+
+```php
+$user = $client->api('user')->showById(202732);
+```
+
 ### Update user information
 
 > Requires [authentication](security.md).

doc/users.md

@@ -36,7 +36,7 @@ public function createInstallationToken($installationId, $userId = null)
 
         $this->configurePreviewHeader();
 
-        return $this->post('/app/installations/'.rawurlencode($installationId).'/access_tokens', $parameters);
+        return $this->post('/app/installations/'.$installationId.'/access_tokens', $parameters);
     }
 
     /**
@@ -66,7 +66,7 @@ public function getInstallation($installationId)
     {
         $this->configurePreviewHeader();
 
-        return $this->get('/app/installations/'.rawurldecode($installationId));
+        return $this->get('/app/installations/'.$installationId);
     }
 
     /**
@@ -129,7 +129,7 @@ public function removeInstallation($installationId)
     {
         $this->configurePreviewHeader();
 
-        $this->delete('/app/installations/'.rawurldecode($installationId));
+        $this->delete('/app/installations/'.$installationId);
     }
 
     /**
@@ -167,7 +167,7 @@ public function addRepository($installationId, $repositoryId)
     {
         $this->configurePreviewHeader();
 
-        return $this->put('/installations/'.rawurlencode($installationId).'/repositories/'.rawurlencode($repositoryId));
+        return $this->put('/installations/'.$installationId.'/repositories/'.$repositoryId);
     }
 
     /**
@@ -184,6 +184,6 @@ public function removeRepository($installationId, $repositoryId)
     {
         $this->configurePreviewHeader();
 
-        return $this->delete('/installations/'.rawurlencode($installationId).'/repositories/'.rawurlencode($repositoryId));
+        return $this->delete('/installations/'.$installationId.'/repositories/'.$repositoryId);
     }
 }

lib/Github/Api/Apps.php

@@ -83,7 +83,7 @@ public function markAsReadInRepository($username, $repository, array $params = [
      */
     public function markAsRead($id, array $params)
     {
-        return $this->patch('/notifications/threads/'.rawurlencode($id), $params);
+        return $this->patch('/notifications/threads/'.$id, $params);
     }
 
     /**
@@ -97,7 +97,7 @@ public function markAsRead($id, array $params)
      */
     public function show($id)
     {
-        return $this->get('/notifications/threads/'.rawurlencode($id));
+        return $this->get('/notifications/threads/'.$id);
     }
 
     /**
@@ -111,7 +111,7 @@ public function show($id)
      */
     public function showSubscription($id)
     {
-        return $this->get('/notifications/threads/'.rawurlencode($id).'/subscription');
+        return $this->get('/notifications/threads/'.$id.'/subscription');
     }
 
     /**
@@ -126,7 +126,7 @@ public function showSubscription($id)
      */
     public function createSubscription($id, array $params)
     {
-        return $this->put('/notifications/threads/'.rawurlencode($id).'/subscription', $params);
+        return $this->put('/notifications/threads/'.$id.'/subscription', $params);
     }
 
     /**
@@ -140,6 +140,6 @@ public function createSubscription($id, array $params)
      */
     public function removeSubscription($id)
     {
-        return $this->delete('/notifications/threads/'.rawurlencode($id).'/subscription');
+        return $this->delete('/notifications/threads/'.$id.'/subscription');
     }
 }

lib/Github/Api/CurrentUser/Notifications.php

@@ -35,7 +35,7 @@ public function all()
      */
     public function show($id)
     {
-        return $this->get('/user/keys/'.rawurlencode($id));
+        return $this->get('/user/keys/'.$id);
     }
 
     /**
@@ -69,6 +69,6 @@ public function create(array $params)
      */
     public function remove($id)
     {
-        return $this->delete('/user/keys/'.rawurlencode($id));
+        return $this->delete('/user/keys/'.$id);
     }
 }

lib/Github/Api/CurrentUser/PublicKeys.php

@@ -38,7 +38,7 @@ public function all($username, $repository, array $params = [])
      */
     public function show($username, $repository, $id)
     {
-        return $this->get('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/deployments/'.rawurlencode($id));
+        return $this->get('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/deployments/'.$id);
     }
 
     /**
@@ -88,7 +88,7 @@ public function updateStatus($username, $repository, $id, array $params)
             throw new MissingArgumentException(['state']);
         }
 
-        return $this->post('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/deployments/'.rawurlencode($id).'/statuses', $params);
+        return $this->post('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/deployments/'.$id.'/statuses', $params);
     }
 
     /**
@@ -102,6 +102,6 @@ public function updateStatus($username, $repository, $id, array $params)
      */
     public function getStatuses($username, $repository, $id)
     {
-        return $this->get('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/deployments/'.rawurlencode($id).'/statuses');
+        return $this->get('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/deployments/'.$id.'/statuses');
     }
 }