From d5735ff77bff41816e983e4e0814c809f86372e6 Mon Sep 17 00:00:00 2001 From: ADmad Date: Sat, 7 May 2022 17:22:00 +0530 Subject: [PATCH 1/2] Allow v2 of PSR libs. --- composer.json | 6 +++--- tests/Test/OpenIDConnect/Provider/AppleTest.php | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index a6492194c..af7fda4df 100644 --- a/composer.json +++ b/composer.json @@ -28,9 +28,9 @@ "require": { "php": ">=7.1", "ext-json": "*", - "psr/http-client": "^1.0", - "psr/simple-cache": "^1.0", - "psr/http-factory": "^1.0", + "psr/http-client": "^1.0 || ^2.0", + "psr/simple-cache": "^1.0 || ^2.0", + "psr/http-factory": "^1.0 || ^2.0", "socialconnect/jwx": "^1.0" }, "require-dev": { diff --git a/tests/Test/OpenIDConnect/Provider/AppleTest.php b/tests/Test/OpenIDConnect/Provider/AppleTest.php index cc8588494..290947ddc 100644 --- a/tests/Test/OpenIDConnect/Provider/AppleTest.php +++ b/tests/Test/OpenIDConnect/Provider/AppleTest.php @@ -31,7 +31,10 @@ protected function getTestResponseForGetIdentity(): ResponseInterface public function testGetOpenIDUrl() { - // nothing to test, because Apple->testGetOpenIDUrl will throw an exception on call + $this->markTestSkipped( + 'Nothing to test, ' + . 'because Apple->testGetOpenIDUrl will throw an exception on call' + ); } public function testGetIdentitySuccess() From 0e48798f8ea6ddb1974fb288188fe07b23f5432a Mon Sep 17 00:00:00 2001 From: ADmad Date: Sat, 7 May 2022 17:25:54 +0530 Subject: [PATCH 2/2] Run testsuite on PHP 8.1 --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 206d62df6..a03b9cfe1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,14 +8,14 @@ jobs: strategy: fail-fast: false matrix: - php-version: ['7.2', '7.4', '8.0'] + php-version: ['7.4', '8.0', '8.1'] composer-opts: [''] include: - php-version: '7.1' composer-opts: '--prefer-lowest' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -25,7 +25,7 @@ jobs: - name: Composer install run: | - if [[ ${{ matrix.php-version }} == '8.0' ]]; then + if [[ ${{ matrix.php-version }} == '8.0' || ${{ matrix.php-version }} == '8.1' ]]; then composer remove --dev squizlabs/php_codesniffer phpstan/phpstan-shim phpunit/phpunit composer require --dev phpunit/phpunit:^8.5 else @@ -51,7 +51,7 @@ jobs: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -68,4 +68,4 @@ jobs: - name: Run phpstan if: success() || failure() - run: vendor/bin/phpstan.phar analyse src/ tests/ --no-progress --level 2 \ No newline at end of file + run: vendor/bin/phpstan.phar analyse src/ tests/ --no-progress --level 2