Update jwt library (#30)

* Updated web-token jwt lib dependency
* Updated JsonWebKeySetService
* Updated to PHP 7.2

Author: sgomez

.travis.yml

@@ -1,7 +1,7 @@
 language: php
 
 php:
-    - '7.1'
+    - '7.2'
 
 sudo: false
 
@@ -24,4 +24,4 @@ script:
     - ./vendor/bin/phpcov merge --clover build/logs/clover.xml build/cov
 
 after_success:
-    - travis_retry php vendor/bin/php-coveralls
+    - travis_retry php vendor/bin/php-coveralls

composer.json

@@ -17,13 +17,13 @@
         }
     ],
     "require": {
-        "php": ">=7.1.0",
+        "php": ">=7.2.0",
         "ext-openssl": "*",
         "league/oauth2-server": "^7.0",
         "nette/forms": "^2.4",
         "psr/container": "^1.0",
         "simplesamlphp/composer-module-installer": "^1.0",
-        "spomky-labs/jose": "^7.0",
+        "web-token/jwt-framework": "^2.1",
         "steverhoades/oauth2-openid-connect-server": "^1.0",
         "zendframework/zend-diactoros": "^1.3"
     },

lib/Services/JsonWebKeySetService.php

@@ -14,8 +14,8 @@
 
 namespace SimpleSAML\Modules\OpenIDConnect\Services;
 
-use Jose\Factory\JWKFactory;
-use Jose\Object\JWKSet;
+use Jose\Component\Core\JWKSet;
+use Jose\Component\KeyManagement\JWKFactory;
 use SimpleSAML\Error\Exception;
 use SimpleSAML\Utils\Config;
 
@@ -40,12 +40,11 @@ public function __construct()
             'alg' => 'RS256',
         ]);
 
-        $this->jwkSet = new JWKSet();
-        $this->jwkSet->addKey($jwk);
+        $this->jwkSet = new JWKSet([$jwk]);
     }
 
     public function keys()
     {
-        return $this->jwkSet->getKeys();
+        return $this->jwkSet->all();
     }
 }

tests/Services/JsonWebKeySetServiceTest.php

@@ -14,11 +14,10 @@
 
 namespace Tests\SimpleSAML\Modules\OpenIDConnect\Services;
 
-use Jose\Factory\JWKFactory;
-use Jose\Object\JWKSet;
+use Jose\Component\Core\JWKSet;
+use Jose\Component\KeyManagement\JWKFactory;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Configuration;
-use SimpleSAML\Error\Exception;
 use SimpleSAML\Modules\OpenIDConnect\Services\JsonWebKeySetService;
 
 class JsonWebKeySetServiceTest extends TestCase
@@ -66,16 +65,15 @@ public function testKeys()
             'use' => 'sig',
             'alg' => 'RS256',
         ]);
-        $JWKSet = new JWKSet();
-        $JWKSet->addKey($jwk);
+        $JWKSet = new JWKSet([$jwk]);
 
         $jsonWebKeySetService = new JsonWebKeySetService();
 
-        $this->assertEquals($JWKSet->getKeys(), $jsonWebKeySetService->keys());
+        $this->assertEquals($JWKSet->all(), $jsonWebKeySetService->keys());
     }
 
     /**
-     * @expectedException Exception
+     * @expectedException \Exception
      */
     public function testCertificationFileNotFound()
     {