Merge branch 'thephpleague:master' into openid-implementation

Author: marcriemer

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [8.5.4] - released 2023-08-25
+### Added
+- Support for league/uri ^7.0 (PR #1367)
+
 ## [8.5.3] - released 2023-07-06
 ### Security
 - If a key string is provided to the CryptKey constructor with an invalid 
@@ -602,7 +606,8 @@ Version 5 is a complete code rewrite.
 
 - First major release
 
-[Unreleased]: https://github.com/thephpleague/oauth2-server/compare/8.5.3...HEAD
+[Unreleased]: https://github.com/thephpleague/oauth2-server/compare/8.5.4...HEAD
+[8.5.4]: https://github.com/thephpleague/oauth2-server/compare/8.5.3...8.5.4
 [8.5.3]: https://github.com/thephpleague/oauth2-server/compare/8.5.2...8.5.3
 [8.5.2]: https://github.com/thephpleague/oauth2-server/compare/8.5.1...8.5.2
 [8.5.1]: https://github.com/thephpleague/oauth2-server/compare/8.5.0...8.5.1

composer.json

@@ -7,7 +7,7 @@
         "php": "^8.0",
         "ext-openssl": "*",
         "league/event": "^2.2",
-        "league/uri": "^6.7",
+        "league/uri": "^6.7 || ^7.0",
         "lcobucci/jwt": "^4.3 || ^5.0",
         "psr/http-message": "^1.0.1 || ^2.0",
         "defuse/php-encryption": "^2.3",