Merge pull request #174 from SocialConnect/psr-libs

Allow v2 of PSR libs.

.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
+        run: vendor/bin/phpstan.phar analyse src/ tests/ --no-progress --level 2

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": {

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()