TA-1964: Upgrade Firebase PHP-JWT (#32)

* TA-1964: Upgrade Firebase PHP-JWT

* add in composer.lock and standard ubuntu image

* add composer.lock back to gitignore

* Delete composer.lock

* bump version

Author: darren-arbon

Dockerfile

@@ -1,4 +1,4 @@
-FROM talis/ubuntu:1404-latest
+FROM ubuntu:trusty
 
 ENV DEBIAN_FRONTEND=noninteractive
 

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "talis/talis-php",
   "description": "This is a php client library for talis APIs",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "keywords": [
     "persona",
     "echo",
@@ -22,7 +22,7 @@
     "ext-hash": "*",
     "ext-openssl": "*",
     "doctrine/common": "^2.5",
-    "firebase/php-jwt": "^3.0",
+    "firebase/php-jwt": "^6.0",
     "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
     "monolog/monolog": ">=1.13.1",
     "predis/predis": ">=0.8.5",

src/Talis/Persona/Client/Tokens.php

@@ -3,6 +3,7 @@
 namespace Talis\Persona\Client;
 
 use Firebase\JWT\JWT;
+use Firebase\JWT\Key;
 use Talis\Persona\Client\ScopesNotDefinedException;
 use Talis\Persona\Client\EmptyResponseException;
 use Talis\Persona\Client\InvalidPublicKeyException;
@@ -124,7 +125,7 @@ protected function decodeToken($token, $rawPublicCert)
             $pubCert = openssl_pkey_get_public($rawPublicCert);
 
             if ($pubCert) {
-                return (array) JWT::decode($token, $pubCert, ['RS256']);
+                return (array) JWT::decode($token, new Key($pubCert, 'RS256'));
             }
 
             $this->getLogger()->error('Invalid public key');