Merge pull request #18 from careerbuilder/RDP-51913

[RDP-51913] Update PHP-JWT version

Author: JackyXinHao

.circleci/config.yml

@@ -1,7 +1,7 @@
 base: &base
     working_directory: ~/php-oauth
     docker:
-        - image: circleci/php:7.4-cli
+        - image: cimg/php:8.4
 
 remote-docker: &remote_docker
     setup_remote_docker
@@ -11,47 +11,47 @@ docker-info: &docker_info
 
 version: 2
 jobs:
-    build-php71:
+    build-php81:
         <<: *base
         steps:
             - checkout
             - *remote_docker
             - *docker_info
-            -   run: docker build --build-arg PHP_VERSION=7.1 -t tests-php71 .
-            -   run: docker run tests-php71
+            -   run: docker build --build-arg PHP_VERSION=8.1 -t tests-php81 .
+            -   run: docker run tests-php81
 
-    build-php72:
+    build-php82:
         <<: *base
         steps:
             - checkout
             - *remote_docker
             - *docker_info
-            -   run: docker build --build-arg PHP_VERSION=7.2 -t tests-php72 .
-            -   run: docker run tests-php72
+            -   run: docker build --build-arg PHP_VERSION=8.2 -t tests-php82 .
+            -   run: docker run tests-php82
 
-    build-php73:
+    build-php83:
         <<: *base
         steps:
             - checkout
             - *remote_docker
             - *docker_info
-            -   run: docker build --build-arg PHP_VERSION=7.3 -t tests-php73 .
-            -   run: docker run tests-php73
+            -   run: docker build --build-arg PHP_VERSION=8.3 -t tests-php83 .
+            -   run: docker run tests-php83
 
-    build-php74:
+    build-php84:
         <<: *base
         steps:
             - checkout
             - *remote_docker
             - *docker_info
-            -   run: docker build --build-arg PHP_VERSION=7.4 -t tests-php74 .
-            -   run: docker run tests-php74
+            -   run: docker build --build-arg PHP_VERSION=8.4 -t tests-php84 .
+            -   run: docker run tests-php84
 
 workflows:
     version: 2
     all:
         jobs:
-            - build-php71
-            - build-php72
-            - build-php73
-            - build-php74
+            - build-php81
+            - build-php82
+            - build-php83
+            - build-php84

Dockerfile

@@ -1,6 +1,6 @@
 ARG PHP_VERSION
-FROM php:${PHP_VERSION:-7.4}-alpine
-RUN apk add --no-cache git $PHPIZE_DEPS && \
+FROM php:${PHP_VERSION:-8.4}-alpine
+RUN apk add --no-cache linux-headers git $PHPIZE_DEPS && \
     pecl install xdebug && \
     docker-php-ext-enable xdebug && \
     curl -# https://getcomposer.org/installer | php && \

composer.json

@@ -5,10 +5,10 @@
     "require": {
         "guzzlehttp/guzzle": "^6.5",
         "psr/log": "^1.1",
-        "firebase/php-jwt": "^5.0"
+        "firebase/php-jwt": "6.5.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7"
+        "phpunit/phpunit": "^8.0"
     },
     "autoload": {
         "psr-0": {

tests/CareerBuilder/OAuth2/Flows/ClientCredentialsTest.php

@@ -14,6 +14,7 @@
 
 use CareerBuilder\OAuth2\AccessToken;
 use Firebase\JWT\JWT;
+use Firebase\JWT\Key;
 use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\Psr7\Response;
@@ -54,7 +55,7 @@ public function testGetToken()
         $postFields = [];
         parse_str($body, $postFields);
 
-        $jwt = JWT::decode($postFields['client_assertion'], 'sharedsecret', ['HS512']);
+        $jwt = JWT::decode($postFields['client_assertion'], new Key('sharedsecret','HS512'));
 
         $this->assertEquals('POST', $request->getMethod());
         $this->assertEquals('clientid', $postFields['client_id']);

tests/CareerBuilder/OAuth2/Flows/JWTBearerAssertionTest.php

@@ -13,6 +13,7 @@
 namespace CareerBuilder\OAuth2\Flows;
 
 use Firebase\JWT\JWT;
+use Firebase\JWT\Key;
 use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\Psr7\Response;
@@ -55,7 +56,7 @@ public function testGetToken()
         $postFields = [];
         parse_str($body, $postFields);
 
-        $jwt = JWT::decode($postFields['assertion'], 'sharedsecret', ['HS512']);
+        $jwt = JWT::decode($postFields['assertion'], new Key('sharedsecret','HS512'));
 
         $this->assertEquals('POST', $request->getMethod());
         $this->assertEquals('clientid', $postFields['client_id']);