Fixed #200

overtrue · Nov 2, 2020 · 765941f · 765941f
1 parent cb1c93c
commit 765941f
Show file tree

Hide file tree

Showing 19 changed files with 99 additions and 78 deletions.
diff --git a/src/Config.php b/src/Config.php
@@ -10,7 +10,7 @@ class Config implements ArrayAccess, \JsonSerializable
     /**
      * @var array
      */
-    protected $config;
+    protected array $config;
 
     /**
      * @param array $config

diff --git a/src/Providers/Alipay.php b/src/Providers/Alipay.php
@@ -29,10 +29,11 @@ protected function getTokenUrl(): string
     }
 
     /**
-     * @param string $token
+     * @param  string  $token
      *
      * @return array
      * @throws \Overtrue\Socialite\Exceptions\InvalidArgumentException
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     protected function getUserByToken(string $token): array
     {
@@ -77,10 +78,12 @@ protected function mapUserToObject(array $user): User
     }
 
     /**
-     * @param string $code
+     * @param  string  $code
      *
      * @return array
+     * @throws \GuzzleHttp\Exception\GuzzleException
      * @throws \Overtrue\Socialite\Exceptions\AuthorizeFailedException
+     * @throws \Overtrue\Socialite\Exceptions\InvalidArgumentException
      */
     public function tokenFromCode(string $code): array
     {
@@ -102,6 +105,10 @@ public function tokenFromCode(string $code): array
         return $this->normalizeAccessTokenResponse($response['alipay_system_oauth_token_response']);
     }
 
+    /**
+     * @return array
+     * @throws \Overtrue\Socialite\Exceptions\InvalidArgumentException
+     */
     protected function getCodeFields(): array
     {
         if (empty($this->redirectUrl)) {

diff --git a/src/Providers/Baidu.php b/src/Providers/Baidu.php
@@ -77,9 +77,10 @@ protected function getTokenFields($code): array
     }
 
     /**
-     * @param string $token
+     * @param  string  $token
      *
      * @return array
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     protected function getUserByToken(string $token): array
     {

diff --git a/src/Providers/Base.php b/src/Providers/Base.php
@@ -56,10 +56,11 @@ public function redirect(?string $redirectUrl = null): string
     }
 
     /**
-     * @param string $code
+     * @param  string  $code
      *
      * @return \Overtrue\Socialite\User
      * @throws \Overtrue\Socialite\Exceptions\AuthorizeFailedException
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     public function userFromCode(string $code): User
     {

diff --git a/src/Providers/DingTalk.php b/src/Providers/DingTalk.php
@@ -87,10 +87,11 @@ protected function createSignature(int $time)
     }
 
     /**
-     * @param string $code
+     * @param  string  $code
      *
      * @return User
      *
+     * @throws \GuzzleHttp\Exception\GuzzleException
      * @see https://ding-doc.dingtalk.com/doc#/personnal/tmudue
      */
     public function userFromCode(string $code): User
@@ -110,7 +111,7 @@ public function userFromCode(string $code): User
         );
         $response = \json_decode($response->getBody()->getContents(), true);
 
-        if (0 != $response['errcode']) {
+        if (0 != $response['errcode'] ?? 1) {
             throw new \InvalidArgumentException('You get error: ' . json_encode($response, JSON_UNESCAPED_UNICODE));
         }
 

diff --git a/src/Providers/DouYin.php b/src/Providers/DouYin.php
@@ -41,10 +41,11 @@ protected function getTokenUrl(): string
     }
 
     /**
-     * @param string $code
+     * @param  string  $code
      *
      * @return array
      * @throws \Overtrue\Socialite\Exceptions\AuthorizeFailedException
+     * @throws \GuzzleHttp\Exception\GuzzleException
      *
      */
     public function tokenFromCode($code): array
@@ -83,10 +84,11 @@ protected function getTokenFields($code): array
     }
 
     /**
-     * @param string $token
+     * @param  string  $token
      *
      * @return array
      * @throws \Overtrue\Socialite\Exceptions\InvalidArgumentException
+     * @throws \GuzzleHttp\Exception\GuzzleException
      *
      */
     protected function getUserByToken(string $token): array

diff --git a/src/Providers/Douban.php b/src/Providers/Douban.php
@@ -22,10 +22,11 @@ protected function getTokenUrl(): string
     }
 
     /**
-     * @param string     $token
-     * @param array|null $query
+     * @param  string  $token
+     * @param  array|null  $query
      *
      * @return array
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     protected function getUserByToken(string $token, ?array $query = []): array
     {
@@ -65,10 +66,11 @@ protected function getTokenFields(string $code): array
     }
 
     /**
-     * @param string $code
+     * @param  string  $code
      *
      * @return array
      * @throws \Overtrue\Socialite\Exceptions\AuthorizeFailedException
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     public function tokenFromCode(string $code): array
     {

diff --git a/src/Providers/FeiShu.php b/src/Providers/FeiShu.php
@@ -33,24 +33,25 @@ protected function getTokenUrl(): string
     }
 
     /**
-     * @param string $code
+     * @param  string  $code
      *
      * @return array
      * @throws \Overtrue\Socialite\Exceptions\AuthorizeFailedException
-     *
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function tokenFromCode($code): array
+    public function tokenFromCode(string $code): array
     {
         return $this->normalizeAccessTokenResponse($this->getTokenFromCode($code));
     }
 
     /**
-     * @param string $code
+     * @param  string  $code
      *
      * @return array
      * @throws AuthorizeFailedException
      *
-     * @throws AuthorizeFailedException
+     * @throws \Overtrue\Socialite\Exceptions\AuthorizeFailedException
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     protected function getTokenFromCode(string $code): array
     {
@@ -74,9 +75,10 @@ protected function getTokenFromCode(string $code): array
     }
 
     /**
-     * @param string $token
+     * @param  string  $token
      *
      * @return array
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     protected function getUserByToken(string $token): array
     {

diff --git a/src/Providers/GitHub.php b/src/Providers/GitHub.php
@@ -20,9 +20,10 @@ protected function getTokenUrl(): string
     }
 
     /**
-     * @param string $token
+     * @param  string  $token
      *
      * @return array
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     protected function getUserByToken(string $token): array
     {
@@ -43,11 +44,11 @@ protected function getUserByToken(string $token): array
     }
 
     /**
-     * @param string $token
+     * @param  string  $token
      *
      * @return string
      */
-    protected function getEmailByToken($token)
+    protected function getEmailByToken(string $token)
     {
         $emailsUrl = 'https://api.github.com/user/emails';
 

diff --git a/src/Providers/Google.php b/src/Providers/Google.php
@@ -27,16 +27,16 @@ protected function getTokenUrl(): string
     }
 
     /**
-     * @param string $code
-     *
-     * @throws \Overtrue\Socialite\Exceptions\AuthorizeFailedException
+     * @param  string  $code
      *
      * @return array
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws \Overtrue\Socialite\Exceptions\AuthorizeFailedException
      */
     public function tokenFromCode($code): array
     {
         $response = $this->getHttpClient()->post($this->getTokenUrl(), [
-            'body' => $this->getTokenFields($code),
+            'form_params' => $this->getTokenFields($code),
         ]);
 
         return $this->normalizeAccessTokenResponse($response->getBody());
@@ -53,10 +53,11 @@ protected function getTokenFields($code): array
     }
 
     /**
-     * @param string     $token
-     * @param array|null $query
+     * @param  string  $token
+     * @param  array|null  $query
      *
      * @return array
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     protected function getUserByToken(string $token, ?array $query = []): array
     {

diff --git a/src/Providers/Linkedin.php b/src/Providers/Linkedin.php
@@ -33,10 +33,11 @@ protected function getTokenFields($code): array
     }
 
     /**
-     * @param string     $token
-     * @param array|null $query
+     * @param  string  $token
+     * @param  array|null  $query
      *
      * @return array
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     protected function getUserByToken(string $token, ?array $query = []): array
     {
@@ -47,11 +48,12 @@ protected function getUserByToken(string $token, ?array $query = []): array
     }
 
     /**
-     * @param string $token
+     * @param  string  $token
      *
      * @return array
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    protected function getBasicProfile($token)
+    protected function getBasicProfile(string $token)
     {
         $url = 'https://api.linkedin.com/v2/me?projection=(id,firstName,lastName,profilePicture(displayImage~:playableStreams))';
 
@@ -66,11 +68,12 @@ protected function getBasicProfile($token)
     }
 
     /**
-     * @param string $token
+     * @param  string  $token
      *
      * @return array
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    protected function getEmailAddress($token)
+    protected function getEmailAddress(string $token)
     {
         $url = 'https://api.linkedin.com/v2/emailAddress?q=members&projection=(elements*(handle~))';
 
@@ -91,18 +94,18 @@ protected function getEmailAddress($token)
      */
     protected function mapUserToObject(array $user): User
     {
-        $preferredLocale = $user['firstName.preferredLocale.language'] ?? null.'_'.$user['firstName.preferredLocale.country'] ?? null;
+        $preferredLocale = ($user['firstName.preferredLocale.language'] ?? null).'_'.($user['firstName.preferredLocale.country']) ?? null;
         $firstName = $user['firstName.localized.'.$preferredLocale] ?? null;
         $lastName = $user['lastName.localized.'.$preferredLocale] ?? null;
         $name = $firstName.' '.$lastName;
 
         $images = $user['profilePicture.displayImage~.elements'] ?? [];
         $avatars = array_filter($images, function ($image) {
-            return $image['data']['com.linkedin.digitalmedia.mediaartifact.StillImage']['storageSize']['width'] === 100;
+            return ($image['data']['com.linkedin.digitalmedia.mediaartifact.StillImage']['storageSize']['width'] ?? 0) === 100;
         });
         $avatar = array_shift($avatars);
         $originalAvatars = array_filter($images, function ($image) {
-            return $image['data']['com.linkedin.digitalmedia.mediaartifact.StillImage']['storageSize']['width'] === 800;
+            return ($image['data']['com.linkedin.digitalmedia.mediaartifact.StillImage']['storageSize']['width'] ?? 0) === 800;
         });
         $originalAvatar = array_shift($originalAvatars);
 
@@ -115,16 +118,4 @@ protected function mapUserToObject(array $user): User
             'avatar_original' => $originalAvatar['identifiers.0.identifier'] ?? null,
         ]);
     }
-
-    /**
-     * @param array $fields
-     *
-     * @return $this
-     */
-    public function fields(array $fields)
-    {
-        $this->fields = $fields;
-
-        return $this;
-    }
 }
diff --git a/src/Providers/Outlook.php b/src/Providers/Outlook.php
@@ -21,10 +21,11 @@ protected function getTokenUrl(): string
     }
 
     /**
-     * @param string     $token
-     * @param array|null $query
+     * @param  string  $token
+     * @param  array|null  $query
      *
      * @return array
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     protected function getUserByToken(string $token, ?array $query = []): array
     {

diff --git a/src/Providers/QCloud.php b/src/Providers/QCloud.php
@@ -42,12 +42,12 @@ protected function getSecretKey(): string
     }
 
     /**
-     * @param string $code
+     * @param  string  $code
      *
      * @return array
      * @throws \Overtrue\Socialite\Exceptions\AuthorizeFailedException
      */
-    public function TokenFromCode($code): array
+    public function TokenFromCode(string $code): array
     {
         $response = $this->performRequest(
             'GET',

diff --git a/src/Providers/QQ.php b/src/Providers/QQ.php
@@ -25,24 +25,25 @@ protected function getTokenUrl(): string
     }
 
     /**
-     * @param string $code
+     * @param  string  $code
      *
      * @return array
      */
-    protected function getTokenFields($code): array
+    protected function getTokenFields(string $code): array
     {
         return parent::getTokenFields($code) + [
             'grant_type' => 'authorization_code',
         ];
     }
 
     /**
-     * @param string $code
+     * @param  string  $code
      *
      * @return array
-     * @throws \Overtrue\Socialite\Exceptions\AuthorizeFailedException|\GuzzleHttp\Exception\GuzzleException
+     * @throws \Overtrue\Socialite\Exceptions\AuthorizeFailedException
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function tokenFromCode($code): array
+    public function tokenFromCode(string $code): array
     {
         $response = $this->getHttpClient()->get($this->getTokenUrl(), [
             'query' => $this->getTokenFields($code),