diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index e56dd68f..da459b99 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -16,13 +16,21 @@ jobs: lint: name: "Lint" runs-on: "ubuntu-latest" + + strategy: + fail-fast: false + matrix: + php-version: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ] + + continue-on-error: ${{ matrix.php-version == '8.1' }} + steps: - uses: "actions/checkout@v2" - uses: "shivammathur/setup-php@v2" with: php-version: "7.4" coverage: "none" - ini-values: "memory_limit=-1" + ini-values: "memory_limit=-1, zend.assertions=1, error_reporting=-1, display_errors=On" tools: "composer:v2" - uses: "ramsey/composer-install@v1" - name: "Lint the PHP source code" @@ -58,19 +66,17 @@ jobs: - "7.3" - "7.4" - "8.0" + - "8.1" experimental: - false - include: - - php-version: "8.1" - experimental: true - composer-options: "--ignore-platform-reqs" + steps: - uses: "actions/checkout@v2" - uses: "shivammathur/setup-php@v2" with: php-version: "${{ matrix.php-version }}" coverage: "pcov" - ini-values: "memory_limit=-1" + ini-values: "memory_limit=-1, zend.assertions=1, error_reporting=-1, display_errors=On" tools: "composer:v2" - name: "Prepare for tests" run: "mkdir -p build/logs" diff --git a/.gitignore b/.gitignore index 8ef05678..9d85098e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ testing/ nbproject/private/ test/log build +/.phpunit.result.cache diff --git a/composer.json b/composer.json index 321a2c26..59201f48 100644 --- a/composer.json +++ b/composer.json @@ -11,9 +11,9 @@ "paragonie/random_compat": "^1 || ^2 || ^9.99" }, "require-dev": { - "mockery/mockery": "^1.3", - "php-parallel-lint/php-parallel-lint": "^1.2", - "phpunit/phpunit": "^5.7 || ^6.0 || ^9.3", + "mockery/mockery": "^1.3.5", + "php-parallel-lint/php-parallel-lint": "^1.3.1", + "phpunit/phpunit": "^5.7 || ^6.0 || ^9.5", "squizlabs/php_codesniffer": "^2.3 || ^3.0" }, "keywords": [ diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index 6d3c563c..304df935 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -19,9 +19,9 @@ GEM concurrent-ruby (1.1.9) dnsruby (1.61.7) simpleidn (~> 0.1) - em-websocket (0.5.2) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) + http_parser.rb (~> 0) ethon (0.15.0) ffi (>= 1.15.0) eventmachine (1.2.7) @@ -48,7 +48,7 @@ GEM ffi (1.15.4) forwardable-extended (2.6.0) gemoji (3.0.1) - github-pages (221) + github-pages (222) github-pages-health-check (= 1.17.9) jekyll (= 3.9.0) jekyll-avatar (= 0.7.0) @@ -101,7 +101,7 @@ GEM html-pipeline (2.14.0) activesupport (>= 2) nokogiri (>= 1.4) - http_parser.rb (0.6.0) + http_parser.rb (0.8.0) i18n (0.9.5) concurrent-ruby (~> 1.0) jekyll (3.9.0) @@ -236,7 +236,7 @@ GEM pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (4.0.6) - racc (1.5.2) + racc (1.6.0) rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) @@ -272,7 +272,7 @@ GEM unf_ext unf_ext (0.0.8) unicode-display_width (1.8.0) - zeitwerk (2.4.2) + zeitwerk (2.5.1) PLATFORMS ruby diff --git a/docs/providers/thirdparty.md b/docs/providers/thirdparty.md index 8e828b71..89a96e3b 100755 --- a/docs/providers/thirdparty.md +++ b/docs/providers/thirdparty.md @@ -88,6 +88,7 @@ Gateway | Composer Package | Maintainer [Naver](https://packagist.org/packages/deminoth/oauth2-naver) | deminoth/oauth2-naver | [SangYeob Bono Yu](https://github.com/deminoth) [Netatmo](https://github.com/rugaard/oauth2-netatmo) | rugaard/oauth2-netatmo | [Morten Rugaard](https://github.com/rugaard) [Nest](https://github.com/stevenmaguire/oauth2-nest) | stevenmaguire/oauth2-nest | [Steven Maguire](https://github.com/stevenmaguire) +[NIBE](https://github.com/olssonm/oauth2-nibe) | olssonm/oauth2-nibe | [Marcus Olsson](https://github.com/olssonm) [Odnoklassniki](https://packagist.org/packages/aego/oauth2-odnoklassniki) | aego/oauth2-odnoklassniki | [Alexey](https://github.com/rakeev) [Okta](https://packagist.org/packages/foxworth42/oauth2-okta) | foxworth42/oauth2-okta | [Ed Walker](https://github.com/foxworth42) [Optimizely](https://packagist.org/packages/widerfunnel/oauth2-optimizely) | widerfunnel/oauth2-optimizely | [WiderFunnel Labs](https://github.com/WiderFunnel-Labs) @@ -116,6 +117,7 @@ Gateway | Composer Package | Maintainer [Thingiverse](https://packagist.org/packages/freshworkx/oauth2-thingiverse) | freshworkx/oauth2-thingiverse | [Jens Neumann](https://github.com/freshworkx) [ThirtySevenSignals](https://github.com/nilesuan/oauth2-thirtysevensignals) | nilesuan/oauth2-thirtysevensignals | [Nile Suan](https://github.com/nilesuan) [Trakt.tv](https://github.com/Bogstag/oauth2-trakt) | bogstag/oauth2-trakt | [Krister Bogstag](https://github.com/Bogstag/) +[Trovo](https://github.com/artandor/oauth2-trovo) | artandor/oauth2-trovo | [Nicolas Mylle](https://github.com/artandor/) [Twinfield](https://github.com/php-twinfield/twinfield) | php-twinfield/twinfield | [Mollie B.V.](https://github.com/mollie) [Twitch.tv](https://github.com/tpavlek/oauth2-twitch) | depotwarehouse/oauth2-twitch | [Troy Pavlek](https://github.com/tpavlek) [Twitch.tv (New API Helix)](https://github.com/vertisan/oauth2-twitch-helix) | vertisan/oauth2-twitch-helix | [Paweł Farys](https://github.com/vertisan) diff --git a/phpunit.xml b/phpunit.xml index bf749bfb..46accb38 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,5 +1,12 @@ - + ./test diff --git a/src/Token/AccessTokenInterface.php b/src/Token/AccessTokenInterface.php index c5f13350..5fd219ff 100644 --- a/src/Token/AccessTokenInterface.php +++ b/src/Token/AccessTokenInterface.php @@ -15,6 +15,7 @@ namespace League\OAuth2\Client\Token; use JsonSerializable; +use ReturnTypeWillChange; use RuntimeException; interface AccessTokenInterface extends JsonSerializable @@ -68,5 +69,6 @@ public function __toString(); * * @return array */ + #[ReturnTypeWillChange] public function jsonSerialize(); } diff --git a/src/Tool/QueryBuilderTrait.php b/src/Tool/QueryBuilderTrait.php index ebccdffc..bdda3e79 100644 --- a/src/Tool/QueryBuilderTrait.php +++ b/src/Tool/QueryBuilderTrait.php @@ -28,6 +28,6 @@ trait QueryBuilderTrait */ protected function buildQueryString(array $params) { - return http_build_query($params, null, '&', \PHP_QUERY_RFC3986); + return http_build_query($params, '', '&', \PHP_QUERY_RFC3986); } }