Merge pull request #30 from generationtux/sc-39688/jwt-artisan-upgrad…

…e-our-jwt-package-to-support
generationtux · Mar 22, 2023 · 7f7a486 · 7f7a486
2 parents 8bf17fa + 1747e67
commit 7f7a486
Show file tree

Hide file tree

Showing 7 changed files with 1,214 additions and 1,007 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,24 +11,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 7.3 ]
-        os: [ ubuntu-latest ]
+        php: [8.1]
+        os: [ubuntu-latest]
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@master
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@master
-      with:
-        php-version: ${{ matrix.php }}
-
-    - name: Install Dependencies
-      uses: php-actions/composer@master
-      with:
-        php_version: ${{ matrix.php }}
-
-    - name: PHP spec
-      uses: php-actions/phpspec@master
-      with:
-        config: phpspec.yml
+      - name: Checkout
+        uses: actions/checkout@master
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@master
+        with:
+          php-version: ${{ matrix.php }}
+
+      - name: Install Dependencies
+        uses: php-actions/composer@master
+        with:
+          version: latest
+          php_version: ${{ matrix.php }}
+
+      - name: Run PHP Spec
+        run: ./vendor/bin/phpspec run -c phpspec.yml
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3-fpm-alpine
+FROM php:8.1-fpm-alpine
 
 # The following labels need to be set as part of the docker build process.
 #   org.opencontainers.image.created
@@ -17,7 +17,7 @@ COPY ./docker/installComposer.sh /tmp/installComposer.sh
 
 RUN apk --no-cache --update add bash ca-certificates libpq postgresql-dev curl git curl git mysql-client unzip wget zip postgresql-client \
     && apk add --no-cache --virtual build-dependencies autoconf build-base g++ make \
-    && pecl install redis xdebug \
+    && pecl install redis xdebug-3.1.4 \
     && docker-php-ext-install bcmath opcache pdo_mysql pdo_pgsql pcntl \
     && docker-php-ext-enable bcmath opcache redis xdebug \
     && chmod +x /tmp/installComposer.sh \

diff --git a/composer.json b/composer.json
@@ -1,34 +1,39 @@
 {
-    "name": "generationtux/jwt-artisan",
-    "description": "JWT auth package for Laravel and Lumen",
-    "keywords": ["jwt", "auth", "laravel", "lumen"],
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Kyle Ferguson",
-            "email": "[email protected]"
-        },
-        {
-          "name": "Damien Russell",
-          "email": "[email protected]"
-        },
-        {
-          "name": "Thomas Manley",
-          "email": "[email protected]"
-        }
-    ],
-    "minimum-stability": "stable",
-    "require": {
-        "firebase/php-jwt": "5.2.0",
-        "illuminate/http": "^6.0|^7.0|^8.0",
-        "illuminate/support": "^6.0|^7.0|^8.0"
+  "name": "generationtux/jwt-artisan",
+  "description": "JWT auth package for Laravel and Lumen",
+  "keywords": [
+    "jwt",
+    "auth",
+    "laravel",
+    "lumen"
+  ],
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Kyle Ferguson",
+      "email": "[email protected]"
     },
-    "require-dev": {
-        "phpspec/phpspec": "6.2.0"
+    {
+      "name": "Damien Russell",
+      "email": "[email protected]"
     },
-    "autoload": {
-        "psr-4": {
-            "GenTux\\Jwt\\": "src/"
-        }
+    {
+      "name": "Thomas Manley",
+      "email": "[email protected]"
     }
+  ],
+  "minimum-stability": "stable",
+  "require": {
+    "firebase/php-jwt": "5.2.0",
+    "illuminate/http": "^6.0|^7.0|^8.0|^9.0",
+    "illuminate/support": "^6.0|^7.0|^8.0|^9.0"
+  },
+  "require-dev": {
+    "phpspec/phpspec": "7.3"
+  },
+  "autoload": {
+    "psr-4": {
+      "GenTux\\Jwt\\": "src/"
+    }
+  }
 }