From f7540a1bd83b75ebedac1da1824c17c60a75854b Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Sat, 2 Dec 2023 10:45:15 +0000 Subject: [PATCH 1/3] Adds L11 support --- composer.json | 10 +++++----- phpunit.xml.dist | 2 +- tests/OAuthTwoTest.php | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 77fd9250..d996711f 100644 --- a/composer.json +++ b/composer.json @@ -18,16 +18,16 @@ "php": "^7.2|^8.0", "ext-json": "*", "guzzlehttp/guzzle": "^6.0|^7.0", - "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0", - "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0", - "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", + "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", + "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", "league/oauth1-client": "^1.10.1" }, "require-dev": { "mockery/mockery": "^1.0", - "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0", + "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0|^9.0", "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^8.0|^9.3" + "phpunit/phpunit": "^8.0|^9.3|^10.4" }, "autoload": { "psr-4": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 3ab05a9e..9800d488 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -12,7 +12,7 @@ > - ./tests/ + ./tests/ diff --git a/tests/OAuthTwoTest.php b/tests/OAuthTwoTest.php index 5c931c94..3a2ecdbe 100644 --- a/tests/OAuthTwoTest.php +++ b/tests/OAuthTwoTest.php @@ -140,7 +140,7 @@ public function testUserReturnsAUserInstanceForTheAuthenticatedRequest() public function testUserReturnsAUserInstanceForTheAuthenticatedFacebookRequest() { $request = Request::create('foo', 'GET', ['state' => str_repeat('A', 40), 'code' => 'code']); - $request->setSession($session = m::mock(SessionInterface::class)); + $request->setLaravelSession($session = m::mock(Session::class)); $session->expects('pull')->with('state')->andReturns(str_repeat('A', 40)); $provider = new FacebookTestProviderStub($request, 'client_id', 'client_secret', 'redirect_uri'); $provider->http = m::mock(stdClass::class); From 38e30ef098d39280fe5511f8be22fe31d07a5806 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Sat, 2 Dec 2023 10:45:37 +0000 Subject: [PATCH 2/3] Apply fixes from StyleCI --- tests/OAuthTwoTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/OAuthTwoTest.php b/tests/OAuthTwoTest.php index 3a2ecdbe..2d878c10 100644 --- a/tests/OAuthTwoTest.php +++ b/tests/OAuthTwoTest.php @@ -16,7 +16,6 @@ use PHPUnit\Framework\TestCase; use stdClass; use Symfony\Component\HttpFoundation\RedirectResponse as SymfonyRedirectResponse; -use Symfony\Component\HttpFoundation\Session\SessionInterface; class OAuthTwoTest extends TestCase { From a1ffebb360f2c39335ed1b2c4ab31100f9437be2 Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Sat, 2 Dec 2023 10:58:54 +0000 Subject: [PATCH 3/3] Removes verbose --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 81cf7258..8914e953 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -75,4 +75,4 @@ jobs: composer update --prefer-dist --no-interaction --no-progress - name: Execute tests - run: vendor/bin/phpunit --verbose + run: vendor/bin/phpunit