Skip to content

Commit e1e7cda

Browse files
Merge branch 'master' into master-token-revocation-introspection
2 parents d84b6df + 73684ba commit e1e7cda

File tree

6 files changed

+118
-118
lines changed

6 files changed

+118
-118
lines changed

.github/workflows/coding-standards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
php-version:
16-
- 8.3
16+
- 8.5
1717
operating-system:
1818
- ubuntu-latest
1919

.github/workflows/static-analysis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
php-version: [8.1, 8.2, 8.3, 8.4, 8.5]
15+
php-version: [8.2, 8.3, 8.4, 8.5]
1616
composer-stability: [prefer-lowest, prefer-stable]
1717
operating-system:
1818
- ubuntu-latest
@@ -34,4 +34,3 @@ jobs:
3434

3535
- name: Run Static Analysis
3636
run: vendor/bin/phpstan analyse
37-

.github/workflows/tests.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ on:
44
push:
55
pull_request:
66
schedule:
7-
- cron: '0 0 * * *'
7+
- cron: "0 0 * * *"
88

99
jobs:
1010
tests:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
php: [8.1, 8.2, 8.3, 8.4, 8.5]
14+
php: [8.2, 8.3, 8.4, 8.5]
1515
os: [ubuntu-latest, windows-latest]
1616
stability: [prefer-lowest, prefer-stable]
1717

@@ -33,17 +33,14 @@ jobs:
3333
coverage: pcov
3434

3535
- name: Install dependencies
36-
run:
37-
composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
36+
run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
3837

3938
- name: Install Scrutinizer/Ocular
40-
run:
41-
composer global require scrutinizer/ocular
39+
run: composer global require scrutinizer/ocular
4240

4341
- name: Execute tests
4442
run: vendor/bin/phpunit --coverage-clover=coverage.clover
4543

4644
- name: Code coverage
4745
if: ${{ github.ref == 'refs/heads/master' && github.repository == 'thephpleague/oauth2-server' && startsWith(matrix.os, 'ubuntu') }}
48-
run:
49-
~/.composer/vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover
46+
run: ~/.composer/vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1111

1212
- User ID is now passed to the finalizeScopes method for the Refresh Grant (PR #1414)
1313

14+
### Removed
15+
16+
- Removed support for PHP 8.1 (PR #1500)
17+
1418
## [9.3.0] - released 2025-11-25
1519

1620
### Added

README.md

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,33 @@
1111

1212
Out of the box it supports the following grants:
1313

14-
* Authorization code grant
15-
* Client credentials grant
16-
* Device authorization grant
17-
* Implicit grant
18-
* Refresh grant
19-
* Resource owner password credentials grant
14+
- Authorization code grant
15+
- Client credentials grant
16+
- Device authorization grant
17+
- Implicit grant
18+
- Refresh grant
19+
- Resource owner password credentials grant
2020

2121
The following RFCs are implemented:
2222

23-
* [RFC6749 "OAuth 2.0"](https://tools.ietf.org/html/rfc6749)
24-
* [RFC6750 "The OAuth 2.0 Authorization Framework: Bearer Token Usage"](https://tools.ietf.org/html/rfc6750)
25-
* [RFC7009 "OAuth 2.0 Token Revocation"](https://tools.ietf.org/html/rfc7009)
26-
* [RFC7519 "JSON Web Token (JWT)"](https://tools.ietf.org/html/rfc7519)
27-
* [RFC7636 "Proof Key for Code Exchange by OAuth Public Clients"](https://tools.ietf.org/html/rfc7636)
28-
* [RFC7662 "OAuth 2.0 Token Introspection"](https://tools.ietf.org/html/rfc7662)
29-
* [RFC8628 "OAuth 2.0 Device Authorization Grant](https://tools.ietf.org/html/rfc8628)
23+
- [RFC6749 "OAuth 2.0"](https://tools.ietf.org/html/rfc6749)
24+
- [RFC6750 "The OAuth 2.0 Authorization Framework: Bearer Token Usage"](https://tools.ietf.org/html/rfc6750)
25+
- [RFC7009 "OAuth 2.0 Token Revocation"](https://tools.ietf.org/html/rfc7009)
26+
- [RFC7519 "JSON Web Token (JWT)"](https://tools.ietf.org/html/rfc7519)
27+
- [RFC7636 "Proof Key for Code Exchange by OAuth Public Clients"](https://tools.ietf.org/html/rfc7636)
28+
- [RFC7662 "OAuth 2.0 Token Introspection"](https://tools.ietf.org/html/rfc7662)
29+
- [RFC8628 "OAuth 2.0 Device Authorization Grant](https://tools.ietf.org/html/rfc8628)
3030

3131
This library was created by Alex Bilbie. Find him on Twitter at [@alexbilbie](https://twitter.com/alexbilbie).
3232

3333
## Requirements
3434

3535
The latest version of this package supports the following versions of PHP:
3636

37-
* PHP 8.1
38-
* PHP 8.2
39-
* PHP 8.3
40-
* PHP 8.4
41-
* PHP 8.5
37+
- PHP 8.2
38+
- PHP 8.3
39+
- PHP 8.4
40+
- PHP 8.5
4241

4342
The `openssl` and `json` extensions are also required.
4443

@@ -69,12 +68,12 @@ We use [Github Actions](https://github.com/features/actions), [Scrutinizer](http
6968

7069
## Community Integrations
7170

72-
* [Drupal](https://www.drupal.org/project/simple_oauth)
73-
* [Laravel Passport](https://github.com/laravel/passport)
74-
* [OAuth 2 Server for CakePHP 3](https://github.com/uafrica/oauth-server)
75-
* [OAuth 2 Server for Mezzio](https://github.com/mezzio/mezzio-authentication-oauth2)
76-
* [OAuth 2 Server Bundle (Symfony)](https://github.com/thephpleague/oauth2-server-bundle)
77-
* [Heimdall for CodeIgniter 4](https://github.com/ezralazuardy/heimdall)
71+
- [Drupal](https://www.drupal.org/project/simple_oauth)
72+
- [Laravel Passport](https://github.com/laravel/passport)
73+
- [OAuth 2 Server for CakePHP 3](https://github.com/uafrica/oauth-server)
74+
- [OAuth 2 Server for Mezzio](https://github.com/mezzio/mezzio-authentication-oauth2)
75+
- [OAuth 2 Server Bundle (Symfony)](https://github.com/thephpleague/oauth2-server-bundle)
76+
- [Heimdall for CodeIgniter 4](https://github.com/ezralazuardy/heimdall)
7877

7978
## Changelog
8079

composer.json

Lines changed: 84 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,88 @@
11
{
2-
"name": "league/oauth2-server",
3-
"description": "A lightweight and powerful OAuth 2.0 authorization and resource server library with support for all the core specification grants. This library will allow you to secure your API with OAuth and allow your applications users to approve apps that want to access their data from your API.",
4-
"homepage": "https://oauth2.thephpleague.com/",
5-
"license": "MIT",
6-
"require": {
7-
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
8-
"ext-openssl": "*",
9-
"league/event": "^3.0",
10-
"league/uri": "^7.0",
11-
"lcobucci/jwt": "^5.0",
12-
"psr/http-message": "^2.0",
13-
"defuse/php-encryption": "^2.4",
14-
"ext-json": "*",
15-
"lcobucci/clock": "^2.3 || ^3.0",
16-
"psr/http-server-middleware": "^1.0"
17-
},
18-
"require-dev": {
19-
"phpunit/phpunit": "^10.5|^11.5|^12.0",
20-
"laminas/laminas-diactoros": "^3.5",
21-
"phpstan/phpstan": "^1.12|^2.0",
22-
"phpstan/phpstan-phpunit": "^1.3.15|^2.0",
23-
"roave/security-advisories": "dev-master",
24-
"phpstan/extension-installer": "^1.3.1",
25-
"phpstan/phpstan-deprecation-rules": "^1.1.4|^2.0",
26-
"phpstan/phpstan-strict-rules": "^1.5.2|^2.0",
27-
"slevomat/coding-standard": "^8.14.1",
28-
"php-parallel-lint/php-parallel-lint": "^1.3.2",
29-
"squizlabs/php_codesniffer": "^3.8"
30-
},
31-
"repositories": [
32-
{
33-
"type": "git",
34-
"url": "https://github.com/thephpleague/oauth2-server.git"
35-
}
36-
],
37-
"keywords": [
38-
"oauth",
39-
"oauth2",
40-
"oauth 2",
41-
"oauth 2.0",
42-
"server",
43-
"auth",
44-
"authorization",
45-
"authorisation",
46-
"authentication",
47-
"resource",
48-
"api",
49-
"protect",
50-
"secure"
51-
],
52-
"authors": [
53-
{
54-
"name": "Alex Bilbie",
55-
"email": "hello@alexbilbie.com",
56-
"homepage": "http://www.alexbilbie.com",
57-
"role": "Developer"
58-
},
59-
{
60-
"name": "Andy Millington",
61-
"email": "andrew@noexceptions.io",
62-
"homepage": "https://www.noexceptions.io",
63-
"role": "Developer"
64-
}
65-
],
66-
"replace": {
67-
"lncd/oauth2": "*",
68-
"league/oauth2server": "*"
69-
},
70-
"autoload": {
71-
"psr-4": {
72-
"League\\OAuth2\\Server\\": "src/"
73-
}
74-
},
75-
"autoload-dev": {
76-
"psr-4": {
77-
"LeagueTests\\": "tests/"
78-
}
2+
"name": "league/oauth2-server",
3+
"description": "A lightweight and powerful OAuth 2.0 authorization and resource server library with support for all the core specification grants. This library will allow you to secure your API with OAuth and allow your applications users to approve apps that want to access their data from your API.",
4+
"homepage": "https://oauth2.thephpleague.com/",
5+
"license": "MIT",
6+
"require": {
7+
"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
8+
"ext-openssl": "*",
9+
"league/event": "^3.0",
10+
"league/uri": "^7.8",
11+
"lcobucci/jwt": "^5.6",
12+
"psr/http-message": "^2.0",
13+
"defuse/php-encryption": "^2.4",
14+
"ext-json": "*",
15+
"lcobucci/clock": "^3.3",
16+
"psr/http-server-middleware": "^1.0"
17+
},
18+
"require-dev": {
19+
"phpunit/phpunit": "^11.5.50",
20+
"laminas/laminas-diactoros": "^3.8",
21+
"phpstan/phpstan": "^2.1.38",
22+
"phpstan/phpstan-phpunit": "^2.0.12",
23+
"roave/security-advisories": "dev-master",
24+
"phpstan/extension-installer": "^1.4.3",
25+
"phpstan/phpstan-deprecation-rules": "^2.0",
26+
"phpstan/phpstan-strict-rules": "^2.0",
27+
"slevomat/coding-standard": "^8.27.1",
28+
"php-parallel-lint/php-parallel-lint": "^1.4",
29+
"squizlabs/php_codesniffer": "^4.0",
30+
"paragonie/random_compat": "^9.99.100"
31+
},
32+
"repositories": [
33+
{
34+
"type": "git",
35+
"url": "https://github.com/thephpleague/oauth2-server.git"
36+
}
37+
],
38+
"keywords": [
39+
"oauth",
40+
"oauth2",
41+
"oauth 2",
42+
"oauth 2.0",
43+
"server",
44+
"auth",
45+
"authorization",
46+
"authorisation",
47+
"authentication",
48+
"resource",
49+
"api",
50+
"protect",
51+
"secure"
52+
],
53+
"authors": [
54+
{
55+
"name": "Alex Bilbie",
56+
"email": "hello@alexbilbie.com",
57+
"homepage": "http://www.alexbilbie.com",
58+
"role": "Developer"
7959
},
80-
"config": {
81-
"allow-plugins": {
82-
"ocramius/package-versions": true,
83-
"phpstan/extension-installer": true,
84-
"dealerdirect/phpcodesniffer-composer-installer": false
85-
}
60+
{
61+
"name": "Andy Millington",
62+
"email": "andrew@noexceptions.io",
63+
"homepage": "https://www.noexceptions.io",
64+
"role": "Developer"
65+
}
66+
],
67+
"replace": {
68+
"lncd/oauth2": "*",
69+
"league/oauth2server": "*"
70+
},
71+
"autoload": {
72+
"psr-4": {
73+
"League\\OAuth2\\Server\\": "src/"
74+
}
75+
},
76+
"autoload-dev": {
77+
"psr-4": {
78+
"LeagueTests\\": "tests/"
79+
}
80+
},
81+
"config": {
82+
"allow-plugins": {
83+
"ocramius/package-versions": true,
84+
"phpstan/extension-installer": true,
85+
"dealerdirect/phpcodesniffer-composer-installer": false
8686
}
87+
}
8788
}

0 commit comments

Comments
 (0)