PHP 8.

Author: overtrue

.gitignore

@@ -6,4 +6,4 @@ composer.lock
 Thumbs.db
 /*.php
 sftp-config.json
-.php_cs.cache
+*.cache

.phpunit.result.cache

@@ -1 +1 @@
-C:37:"PHPUnit\Runner\DefaultTestResultCache":1272:{a:2:{s:7:"defects";a:6:{s:50:"Providers\FeiShuTest::testProviderCanCreateCorrect";i:3;s:50:"Providers\FeiShuTest::testConfigAppAccessTokenWork";i:4;s:90:"Providers\FeiShuTest::testConfigAppAccessTokenWithDefaultModeAndAppTicketWorkInBadResponse";i:3;s:91:"Providers\FeiShuTest::testConfigAppAccessTokenWithDefaultModeAndAppTicketWorkInGoodResponse";i:4;s:71:"Providers\FeiShuTest::testConfigAppAccessTokenWithInternalInBadResponse";i:3;s:72:"Providers\FeiShuTest::testConfigAppAccessTokenWithInternalInGoodResponse";i:4;}s:5:"times";a:9:{s:50:"Providers\FeiShuTest::testProviderCanCreateCorrect";d:0.003;s:57:"Providers\FeiShuTest::testProviderWithInternalAppModeWork";d:0;s:51:"Providers\FeiShuTest::testProviderWithAppTicketWork";d:0;s:50:"Providers\FeiShuTest::testConfigAppAccessTokenWork";d:0.003;s:76:"Providers\FeiShuTest::testConfigAppAccessTokenWithDefaultModeNoAppTicketWork";d:0.003;s:90:"Providers\FeiShuTest::testConfigAppAccessTokenWithDefaultModeAndAppTicketWorkInBadResponse";d:0.002;s:91:"Providers\FeiShuTest::testConfigAppAccessTokenWithDefaultModeAndAppTicketWorkInGoodResponse";d:0;s:71:"Providers\FeiShuTest::testConfigAppAccessTokenWithInternalInBadResponse";d:0;s:72:"Providers\FeiShuTest::testConfigAppAccessTokenWithInternalInGoodResponse";d:0;}}}
+{"version":1,"defects":{"OAuthTest::test_it_can_get_token":4,"OAuthTest::test_it_can_get_user_by_code":4,"WechatTest::testWeChatProviderHasCorrectlyRedirectResponse":6},"times":{"OAuthTest::test_it_can_get_auth_url_without_redirect":0.003,"OAuthTest::test_it_can_get_auth_url_with_redirect":0,"OAuthTest::test_it_can_get_auth_url_with_scopes":0,"OAuthTest::test_it_can_get_auth_url_with_state":0,"OAuthTest::test_it_can_get_token":0.01,"OAuthTest::test_it_can_get_user_by_token":0,"OAuthTest::test_it_can_get_user_by_code":0,"Providers\\FeiShuTest::testProviderCanCreateCorrect":0.001,"Providers\\FeiShuTest::testProviderWithInternalAppModeWork":0,"Providers\\FeiShuTest::testProviderWithAppTicketWork":0,"Providers\\FeiShuTest::testConfigAppAccessTokenWithDefaultModeNoAppTicketWork":0.003,"Providers\\FeiShuTest::testConfigAppAccessTokenWithDefaultModeAndAppTicketWorkInBadResponse":0.003,"Providers\\FeiShuTest::testConfigAppAccessTokenWithDefaultModeAndAppTicketWorkInGoodResponse":0,"Providers\\FeiShuTest::testConfigAppAccessTokenWithInternalInBadResponse":0,"Providers\\FeiShuTest::testConfigAppAccessTokenWithInternalInGoodResponse":0,"WeWorkTest::testQrConnect":0,"WeWorkTest::testOAuthWithAgentId":0,"WeWorkTest::testOAuthWithoutAgentId":0,"WechatTest::testWeChatProviderHasCorrectlyRedirectResponse":0.001,"WechatTest::testWeChatProviderTokenUrlAndRequestFields":0,"WechatTest::testOpenPlatformComponent":0,"WechatTest::testOpenPlatformComponentWithCustomParameters":0,"SocialiteManagerTest::test_it_can_create_from_config":0.003,"SocialiteManagerTest::test_it_can_create_from_custom_creator":0,"SocialiteManagerTest::test_it_can_create_from_custom_provider_class":0,"UserTest::testJsonserialize":0,"UserTest::test_it_can_get_refresh_token":0,"UserTest::test_it_can_set_raw_data":0,"UserTest::test_ie_can_get_attribute_by_magic_method":0}}

.travis.yml

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) overtrue <[email protected]>
+Copyright (c) 2021 overtrue <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

LICENSE.txt LICENSE

@@ -1,21 +1,16 @@
-<h1 align="center"> Socialite</h1>
-<p align="center">
-<a href="https://packagist.org/packages/overtrue/socialite"><img src="https://poser.pugx.org/overtrue/socialite/v/stable.svg" alt="Latest Stable Version"></a>
-<a href="https://packagist.org/packages/overtrue/socialite"><img src="https://poser.pugx.org/overtrue/socialite/v/unstable.svg" alt="Latest Unstable Version"></a>
-<a href="https://scrutinizer-ci.com/g/overtrue/socialite/build-status/master"><img src="https://scrutinizer-ci.com/g/overtrue/socialite/badges/build.png?b=master" alt="Build Status"></a>
-<a href="https://packagist.org/packages/overtrue/socialite"><img src="https://poser.pugx.org/overtrue/socialite/downloads" alt="Total Downloads"></a>
-<a href="https://packagist.org/packages/overtrue/socialite"><img src="https://poser.pugx.org/overtrue/socialite/license" alt="License"></a>
-</p>
+# Socialite
 
+Socialite is an [OAuth2](https://oauth.net/2/)  Authentication tool. It is inspired by [laravel/socialite](https://github.com/laravel/socialite), You can easily use it in any PHP project.    [中文文档](/README_CN.md)
 
-<p align="center">Socialite is an <a href="https://oauth.net/2/">OAuth2</a>  Authentication tool. It is inspired by <a href="https://github.com/laravel/socialite">laravel/socialite</a>, You can easily use it in any PHP project.       <a href="/README_CN.md">中文文档</a></p>
-
-<p align="center">This tool now supports platforms such as Facebook, GitHub, Google, LinkedIn, Outlook, QQ, Tapd, Alipay, Taobao, Baidu, DingTalk, Weibo, WeChat, Douyin, Feishu, Douban, WeWork, Tencent Cloud, Line, Gitee.</p>
+![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/overtrue/laravel-socialite?style=flat-square)
+![GitHub License](https://img.shields.io/github/license/overtrue/laravel-socialite?style=flat-square)
+![Packagist Downloads](https://img.shields.io/packagist/dt/overtrue/laravel-socialite?style=flat-square)
 
 [![Sponsor me](https://github.com/overtrue/overtrue/blob/master/sponsor-me-button-s.svg?raw=true)](https://github.com/sponsors/overtrue)
 
-如果你喜欢我的项目并想支持它，[点击这里 :heart:](https://github.com/sponsors/overtrue)
+This tool now supports platforms such as Facebook, GitHub, Google, LinkedIn, Outlook, QQ, Tapd, Alipay, Taobao, Baidu, DingTalk, Weibo, WeChat, Douyin, Feishu, Douban, WeWork, Tencent Cloud, Line, Gitee.
 
+如果你喜欢我的项目并想支持它，[点击这里 :heart:](https://github.com/sponsors/overtrue)
 
 - [Requirement](#requirement)
 - [Installation](#installation)
@@ -51,7 +46,7 @@
 # Requirement
 
 ```
-PHP >= 7.4
+PHP >= 8.0.2
 ```
 # Installation
 

README.md

@@ -1,18 +1,14 @@
-<h1 align="center"> Socialite</h1>
-<p align="center">
-<a href="https://packagist.org/packages/overtrue/socialite"><img src="https://poser.pugx.org/overtrue/socialite/v/stable.svg" alt="Latest Stable Version"></a>
-<a href="https://packagist.org/packages/overtrue/socialite"><img src="https://poser.pugx.org/overtrue/socialite/v/unstable.svg" alt="Latest Unstable Version"></a>
-<a href="https://scrutinizer-ci.com/g/overtrue/socialite/build-status/master"><img src="https://scrutinizer-ci.com/g/overtrue/socialite/badges/build.png?b=master" alt="Build Status"></a>
-<a href="https://scrutinizer-ci.com/g/overtrue/socialite/?branch=master"><img src="https://scrutinizer-ci.com/g/overtrue/socialite/badges/quality-score.png?b=master" alt="Scrutinizer Code Quality"></a>
-<a href="https://scrutinizer-ci.com/g/overtrue/socialite/?branch=master"><img src="https://scrutinizer-ci.com/g/overtrue/socialite/badges/coverage.png?b=master" alt="Code Coverage"></a>
-<a href="https://packagist.org/packages/overtrue/socialite"><img src="https://poser.pugx.org/overtrue/socialite/downloads" alt="Total Downloads"></a>
-<a href="https://packagist.org/packages/overtrue/socialite"><img src="https://poser.pugx.org/overtrue/socialite/license" alt="License"></a>
-</p>
+# Socialite
 
+Socialite 是一个 [OAuth2](https://oauth.net/2/) 认证工具。 它的灵感来源于 [laravel/socialite](https://github.com/laravel/socialite) ， 你可以很轻易的在任何 PHP 项目中使用它。
 
-<p align="center">Socialite 是一个 <a href="https://oauth.net/2/">OAuth2</a> 认证工具。 它的灵感来源于 <a href="https://github.com/laravel/socialite">laravel/socialite</a>， 你可以很轻易的在任何 PHP 项目中使用它。</p>
+![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/overtrue/laravel-socialite?style=flat-square)
+![GitHub License](https://img.shields.io/github/license/overtrue/laravel-socialite?style=flat-square)
+![Packagist Downloads](https://img.shields.io/packagist/dt/overtrue/laravel-socialite?style=flat-square)
 
-<p align="center">该工具现已支持平台有：Facebook，Github，Google，Linkedin，Outlook，QQ，TAPD，支付宝，淘宝，百度，钉钉，微博，微信，抖音，飞书，豆瓣，企业微信，腾讯云，Line，Gitee。</p>
+[![Sponsor me](https://github.com/overtrue/overtrue/blob/master/sponsor-me-button-s.svg?raw=true)](https://github.com/sponsors/overtrue)
+
+该工具现已支持平台有：Facebook，Github，Google，Linkedin，Outlook，QQ，TAPD，支付宝，淘宝，百度，钉钉，微博，微信，抖音，飞书，豆瓣，企业微信，腾讯云，Line，Gitee。
 
 - [版本要求](#版本要求)
 - [安装](#安装)
@@ -48,7 +44,7 @@
 # 版本要求
 
 ```
-PHP >= 7.4
+PHP >= 8.0.2
 ```
 
 # 安装

README_CN.md

@@ -17,17 +17,18 @@
     }
   },
   "require": {
-    "php": ">=7.4",
-    "symfony/http-foundation": "^5.0",
-    "guzzlehttp/guzzle": "~6.0|~7.0",
+    "php": ">=8.0.2",
     "ext-json": "*",
-    "symfony/psr-http-message-bridge": "^2.0",
-    "ext-openssl": "*"
+    "ext-openssl": "*",
+    "guzzlehttp/guzzle": "^7.0",
+    "symfony/http-foundation": "^6.0",
+    "symfony/psr-http-message-bridge": "^2.1"
   },
   "require-dev": {
-    "mockery/mockery": "~1.2",
-    "phpunit/phpunit": "~9.0",
-    "friendsofphp/php-cs-fixer": "^3.0"
+    "friendsofphp/php-cs-fixer": "^3.0",
+    "mockery/mockery": "^1.3",
+    "phpunit/phpunit": "^9.0",
+    "jetbrains/phpstorm-attributes": "^1.0"
   },
   "license": "MIT",
   "authors": [

composer.json

@@ -86,27 +86,27 @@ public function has(string $key): bool
         return (bool) $this->get($key);
     }
 
-    public function offsetExists($offset)
+    public function offsetExists(mixed $offset): bool
     {
         return array_key_exists($offset, $this->config);
     }
 
-    public function offsetGet($offset)
+    public function offsetGet(mixed $offset): mixed
     {
         return $this->get($offset);
     }
 
-    public function offsetSet($offset, $value)
+    public function offsetSet(mixed $offset, $value): void
     {
         $this->set($offset, $value);
     }
 
-    public function offsetUnset($offset)
+    public function offsetUnset(mixed $offset): void
     {
         $this->set($offset, null);
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return $this->config;
     }

src/Config.php

@@ -2,13 +2,11 @@
 
 namespace Overtrue\Socialite\Contracts;
 
-use Overtrue\Socialite\User;
-
 interface ProviderInterface
 {
     public function redirect(?string $redirectUrl = null): string;
 
-    public function userFromCode(string $code): User;
+    public function userFromCode(string $code): UserInterface;
 
-    public function userFromToken(string $token): User;
+    public function userFromToken(string $token): UserInterface;
 }

src/Contracts/ProviderInterface.php

@@ -4,7 +4,7 @@
 
 interface UserInterface
 {
-    public function getId();
+    public function getId(): mixed;
 
     public function getNickname(): ?string;
 

src/Contracts/UserInterface.php

@@ -2,15 +2,14 @@
 
 namespace Overtrue\Socialite\Exceptions;
 
+use JetBrains\PhpStorm\Pure;
+
 class AuthorizeFailedException extends Exception
 {
     public array $body;
 
-    /**
-     * @param string $message
-     * @param array  $body
-     */
-    public function __construct(string $message, $body)
+    #[Pure]
+    public function __construct(string $message, mixed $body)
     {
         parent::__construct($message, -1);
 

src/Exceptions/AuthorizeFailedException.php

@@ -2,9 +2,6 @@
 
 namespace Overtrue\Socialite\Exceptions;
 
-/**
- * Class BadRequestException.
- */
 class BadRequestException extends Exception
 {
 }

src/Exceptions/BadRequestException.php

@@ -4,9 +4,6 @@
 
 use Overtrue\Socialite\Exceptions\Exception;
 
-/**
- * Class BadRequestException.
- */
 class InvalidTicketException extends Exception
 {
 }

src/Exceptions/Feishu/InvalidTicketException.php

@@ -2,14 +2,13 @@
 
 namespace Overtrue\Socialite\Exceptions;
 
+use JetBrains\PhpStorm\Pure;
+
 class InvalidTokenException extends Exception
 {
     public string $token;
 
-    /**
-     * @param string $message
-     * @param string $token
-     */
+    #[Pure]
     public function __construct(string $message, string $token)
     {
         parent::__construct($message, -1);