Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
ramsey committed Apr 16, 2023
2 parents cc35fb1 + 164ccb0 commit 4884dea
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/Provider/AbstractProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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<string, mixed> $options
* @throws IdentityProviderException
* @return AccessTokenInterface
*/
Expand Down
5 changes: 5 additions & 0 deletions test/src/Tool/ProviderRedirectTraitTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ class ProviderRedirectTraitTest extends TestCase
{
use ProviderRedirectTrait;

/**
* @var ClientInterface
*/
private $httpClient;

public function getHttpClient()
{
return $this->httpClient;
Expand Down

0 comments on commit 4884dea

Please sign in to comment.