From 0192c0dd18e29f25e32437c976849c219b9afff3 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Mon, 1 Apr 2019 13:15:22 +0800 Subject: [PATCH 1/2] Update phpunit. Signed-off-by: Mior Muhammad Zaki --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 739d096..b11a15d 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "require-dev": { "friendsofphp/php-cs-fixer": "~2.9", "mockery/mockery": "^1.0", - "phpunit/phpunit": "^7.0 || ^8.0" + "phpunit/phpunit": "^7.5 || ^8.0" }, "extra": { "branch-alias": { From 6e854f0275617f1c98104a281e65427d05061fbe Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Mon, 1 Apr 2019 13:31:36 +0800 Subject: [PATCH 2/2] Add missing import. Signed-off-by: Mior Muhammad Zaki --- src/Provider.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Provider.php b/src/Provider.php index 1d6a39c..3ef8b3e 100644 --- a/src/Provider.php +++ b/src/Provider.php @@ -3,6 +3,7 @@ namespace Katsana\Socialite; use Illuminate\Container\Container; +use Katsana\Sdk\Client; use Laravel\Socialite\Two\ProviderInterface; use SocialiteProviders\Manager\OAuth2\AbstractProvider; use SocialiteProviders\Manager\OAuth2\User; @@ -61,7 +62,7 @@ public static function setEnvironment(?string $environment = null) */ protected function getEnvironment(): string { - if (is_null($environment = static::$environment)) { + if (\is_null($environment = static::$environment)) { $environment = $this->getConfig('environment', 'production'); } @@ -79,7 +80,7 @@ protected function getEnvironmentEndpoint(?string $group = null): ?string { $environment = $this->getEnvironment(); - if (is_null($group) || empty($group)) { + if (\is_null($group) || empty($group)) { return static::$endpoints[$environment]; } @@ -153,7 +154,7 @@ protected function mapUserToObject(array $user) */ protected function getTokenFields($code) { - return array_merge(parent::getTokenFields($code), [ + return \array_merge(parent::getTokenFields($code), [ 'grant_type' => 'authorization_code', ]); }