From 26b7143c9269d0c6f0ac8e5dee4bb5041d60e3fd Mon Sep 17 00:00:00 2001 From: flbergeron Date: Thu, 21 Nov 2024 08:03:38 -0500 Subject: [PATCH 1/3] add laravel 11 support --- .circleci/config.yml | 2 +- composer.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 06885d2d4..0ed9eb62b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ docker-auth: &docker-auth defaults: &defaults working_directory: ~/league-oauth2-server docker: - - image: cimg/php:8.1 + - image: cimg/php:8.2 <<: *docker-auth version: 2.1 diff --git a/composer.json b/composer.json index c538eafdd..4f49382f8 100644 --- a/composer.json +++ b/composer.json @@ -4,13 +4,13 @@ "homepage": "http://oauth2.thephpleague.com/", "license": "MIT", "require": { - "php": ">=8.0.2", - "symfony/http-foundation": "^6.0", + "php": "^8.2", + "symfony/http-foundation": "^7.0", "league/event": "~2.1" }, "require-dev": { - "phpunit/phpunit": "^9.0", - "mockery/mockery": "^1.0" + "phpunit/phpunit": "^10.5|^11.0", + "mockery/mockery": "^1.6.10" }, "repositories": [ { From 366a706ef7453b502dc66be16b6f6fff878e2285 Mon Sep 17 00:00:00 2001 From: flbergeron Date: Wed, 4 Dec 2024 08:47:46 -0500 Subject: [PATCH 2/3] set phpunit/phpunit to 10.5 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4f49382f8..d6d0acdb9 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "league/event": "~2.1" }, "require-dev": { - "phpunit/phpunit": "^10.5|^11.0", + "phpunit/phpunit": "^10.5", "mockery/mockery": "^1.6.10" }, "repositories": [ From 65f0fba9447528f9e09a8d8cfd1c4172901563a2 Mon Sep 17 00:00:00 2001 From: flbergeron Date: Wed, 4 Dec 2024 09:29:02 -0500 Subject: [PATCH 3/3] Update ResourceServerTest.php --- tests/unit/ResourceServerTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/unit/ResourceServerTest.php b/tests/unit/ResourceServerTest.php index 129430681..f20bd9cd0 100644 --- a/tests/unit/ResourceServerTest.php +++ b/tests/unit/ResourceServerTest.php @@ -77,7 +77,7 @@ public function testDetermineAccessTokenMissingToken() ); $request = new \Symfony\Component\HttpFoundation\Request(); - $request->headers = new \Symfony\Component\HttpFoundation\ParameterBag([ + $request->headers = new \Symfony\Component\HttpFoundation\HeaderBag([ 'HTTP_AUTHORIZATION' => 'Bearer', ]); $server->setRequest($request); @@ -160,7 +160,7 @@ public function testIsValid() ); $request = new \Symfony\Component\HttpFoundation\Request(); - $request->headers = new \Symfony\Component\HttpFoundation\ParameterBag([ + $request->headers = new \Symfony\Component\HttpFoundation\HeaderBag([ 'Authorization' => 'Bearer abcdef', ]); $server->setRequest($request); @@ -215,7 +215,7 @@ public function testIsValidExpiredToken() ); $request = new \Symfony\Component\HttpFoundation\Request(); - $request->headers = new \Symfony\Component\HttpFoundation\ParameterBag([ + $request->headers = new \Symfony\Component\HttpFoundation\HeaderBag([ 'Authorization' => 'Bearer abcdef', ]); $server->setRequest($request);