From 3e806eaafee3aa99d6d93df4045119de3092c206 Mon Sep 17 00:00:00 2001 From: Tristan Bessoussa Date: Wed, 21 Feb 2018 16:10:12 +0100 Subject: [PATCH 1/3] Change underlying library for discord --- README.md | 2 +- .../Providers/DiscordProviderConfigurator.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6ed15420..8541e766 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ via Composer: | [Clever](https://github.com/schoolrunner/oauth2-clever) | composer require schoolrunner/oauth2-clever | | [DevianArt](https://github.com/SeinopSys/oauth2-deviantart) | composer require seinopsys/oauth2-deviantart | | [DigitalOcean](https://github.com/chrishemmings/oauth2-digitalocean) | composer require chrishemmings/oauth2-digitalocean | -| [Discord](https://github.com/teamreflex/oauth2-discord) | composer require team-reflex/oauth2-discord | +| [Discord](https://github.com/wohali/oauth2-discord-new) | composer require team-reflex/oauth2-discord | | [Dribbble](https://github.com/crewlabs/oauth2-dribbble) | composer require crewlabs/oauth2-dribbble | | [Dropbox](https://github.com/stevenmaguire/oauth2-dropbox) | composer require stevenmaguire/oauth2-dropbox | | [Drupal](https://github.com/chrishemmings/oauth2-drupal) | composer require chrishemmings/oauth2-drupal | diff --git a/src/DependencyInjection/Providers/DiscordProviderConfigurator.php b/src/DependencyInjection/Providers/DiscordProviderConfigurator.php index 7b31b106..6c60baaf 100644 --- a/src/DependencyInjection/Providers/DiscordProviderConfigurator.php +++ b/src/DependencyInjection/Providers/DiscordProviderConfigurator.php @@ -21,7 +21,7 @@ public function buildConfiguration(NodeBuilder $node) public function getProviderClass(array $config) { - return 'Discord\OAuth\Discord'; + return 'Wohali\OAuth2\Client\Provider\Discord'; } public function getProviderOptions(array $config) @@ -34,12 +34,12 @@ public function getProviderOptions(array $config) public function getPackagistName() { - return 'team-reflex/oauth2-discord'; + return 'wohali/oauth2-discord-new'; } public function getLibraryHomepage() { - return 'https://github.com/teamreflex/oauth2-discord'; + return 'https://github.com/wohali/oauth2-discord-new'; } public function getProviderDisplayName() From 33f8c3b003354e42bde9d5f8fc98b1169a523964 Mon Sep 17 00:00:00 2001 From: Tristan Bessoussa Date: Thu, 22 Feb 2018 10:43:52 +0100 Subject: [PATCH 2/3] fix readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8541e766..9776d70f 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ via Composer: | [Clever](https://github.com/schoolrunner/oauth2-clever) | composer require schoolrunner/oauth2-clever | | [DevianArt](https://github.com/SeinopSys/oauth2-deviantart) | composer require seinopsys/oauth2-deviantart | | [DigitalOcean](https://github.com/chrishemmings/oauth2-digitalocean) | composer require chrishemmings/oauth2-digitalocean | -| [Discord](https://github.com/wohali/oauth2-discord-new) | composer require team-reflex/oauth2-discord | +| [Discord](https://github.com/wohali/oauth2-discord-new) | composer require wohali/oauth2-discord-new | | [Dribbble](https://github.com/crewlabs/oauth2-dribbble) | composer require crewlabs/oauth2-dribbble | | [Dropbox](https://github.com/stevenmaguire/oauth2-dropbox) | composer require stevenmaguire/oauth2-dropbox | | [Drupal](https://github.com/chrishemmings/oauth2-drupal) | composer require chrishemmings/oauth2-drupal | From 349dc782d7afcdcbb1ef11d3d973c6bcc437ff78 Mon Sep 17 00:00:00 2001 From: Tristan Bessoussa Date: Thu, 22 Feb 2018 10:52:40 +0100 Subject: [PATCH 3/3] Fix return type --- src/Client/Provider/DiscordClient.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Client/Provider/DiscordClient.php b/src/Client/Provider/DiscordClient.php index fb00a994..8b3e00ec 100644 --- a/src/Client/Provider/DiscordClient.php +++ b/src/Client/Provider/DiscordClient.php @@ -12,13 +12,13 @@ use KnpU\OAuth2ClientBundle\Client\OAuth2Client; use League\OAuth2\Client\Token\AccessToken; -use Discord\OAuth\Parts\User; +use Wohali\OAuth2\Client\Provider\DiscordResourceOwner; class DiscordClient extends OAuth2Client { /** * @param AccessToken $accessToken - * @return User + * @return DiscordResourceOwner */ public function fetchUserFromToken(AccessToken $accessToken) { @@ -26,7 +26,7 @@ public function fetchUserFromToken(AccessToken $accessToken) } /** - * @return User + * @return DiscordResourceOwner */ public function fetchUser() {