From 25f6a272439da1e3b0ca59302a5f857b1ce02f62 Mon Sep 17 00:00:00 2001 From: Ian den Hartog Date: Sun, 16 Apr 2023 18:46:40 +0200 Subject: [PATCH 1/2] Add php 8.2 to test matrix (#996) --- .github/workflows/continuous-integration.yml | 4 ++-- test/src/Tool/ProviderRedirectTraitTest.php | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 4a8cf1b0..baf35ea4 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - php-version: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ] + php-version: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ] steps: - uses: "actions/checkout@v2" - uses: "shivammathur/setup-php@v2" @@ -72,7 +72,7 @@ jobs: strategy: fail-fast: false matrix: - php-version: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ] + php-version: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ] steps: - uses: "actions/checkout@v2" - uses: "shivammathur/setup-php@v2" diff --git a/test/src/Tool/ProviderRedirectTraitTest.php b/test/src/Tool/ProviderRedirectTraitTest.php index e761cd9b..dc06f45a 100644 --- a/test/src/Tool/ProviderRedirectTraitTest.php +++ b/test/src/Tool/ProviderRedirectTraitTest.php @@ -15,6 +15,11 @@ class ProviderRedirectTraitTest extends TestCase { use ProviderRedirectTrait; + /** + * @var ClientInterface + */ + private $httpClient; + public function getHttpClient() { return $this->httpClient; From 164ccb0287d4f1c2f1311c9c10ce16af1fbea77d Mon Sep 17 00:00:00 2001 From: Yassine Guedidi Date: Sun, 16 Apr 2023 18:52:46 +0200 Subject: [PATCH 2/2] Improve type of $options parameter in Provider\AbstractProvider::getAccessToken() (#997) --- src/Provider/AbstractProvider.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Provider/AbstractProvider.php b/src/Provider/AbstractProvider.php index a6c7a8fd..07f66b8c 100644 --- a/src/Provider/AbstractProvider.php +++ b/src/Provider/AbstractProvider.php @@ -611,8 +611,8 @@ protected function getAccessTokenRequest(array $params) /** * Requests an access token using a specified grant and option set. * - * @param mixed $grant - * @param array $options + * @param mixed $grant + * @param array $options * @throws IdentityProviderException * @return AccessTokenInterface */