Merge branch 'develop' into develop

tymondesigns · Jan 22, 2025 · 694d3a9 · 694d3a9
2 parents f1ba750 + 014be8d
commit 694d3a9
Show file tree

Hide file tree

Showing 55 changed files with 392 additions and 392 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -14,18 +14,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [7.2, 7.3, 7.4, 8.0]
-        laravel: [6.*, 7.*, 8.*]
+        php: [7.4, 8.0, 8.1]
+        laravel: [6.*, 7.*, 8.*, 9.*]
         os: [ubuntu-latest]
         coverage: [none]
         include:
-          - php: 8.0
-            laravel: 8.*
+          - php: 8.1
+            laravel: 9.*
             os: ubuntu-latest
             coverage: xdebug
         exclude:
-          - php: 7.2
-            laravel: 8.*
+          - php: 7.4
+            laravel: 9.*
 
     name: '[P${{ matrix.php }}] [L${{ matrix.laravel }}] [${{ matrix.coverage }}]'
 

diff --git a/.styleci.yml b/.styleci.yml
@@ -2,7 +2,4 @@ preset: laravel
 
 enabled:
   - no_useless_else
-  - phpdoc_order
-  - phpdoc_separation
   - unalign_double_arrow
-  # - length_ordered_imports
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 ![jwt-auth-banner](https://cloud.githubusercontent.com/assets/1801923/9915273/119b9350-5cae-11e5-850b-c941cac60b32.png)
 
-[![PHPUnit](https://github.com/tymondesigns/jwt-auth/workflows/PHPUnit%20tests/badge.svg)](https://travis-ci.org/tymondesigns/jwt-auth)
+[![PHPUnit](https://github.com/tymondesigns/jwt-auth/workflows/PHPUnit%20tests/badge.svg)](https://github.com/tymondesigns/jwt-auth/actions)
 [![Codecov branch](https://img.shields.io/codecov/c/github/tymondesigns/jwt-auth/develop.svg?style=flat-square&logo=codecov)](https://codecov.io/github/tymondesigns/jwt-auth)
 [![StyleCI](https://styleci.io/repos/23680678/shield?style=flat-square)](https://styleci.io/repos/23680678)
 [![Latest Version](http://img.shields.io/packagist/v/tymon/jwt-auth.svg?style=flat-square&logo=composer)](https://packagist.org/packages/tymon/jwt-auth)

diff --git a/composer.json b/composer.json
@@ -23,11 +23,12 @@
         }
     ],
     "require": {
-        "php": "^7.2|^8.0",
+        "php": "^7.4|^8.0|^8.1|^8.2",
         "illuminate/auth": "^5.2|^6|^7|^8|^9",
         "illuminate/contracts": "^5.2|^6|^7|^8|^9",
         "illuminate/http": "^5.2|^6|^7|^8|^9",
-        "lcobucci/jwt": "<3.4",
+        "illuminate/support": "^5.2|^6|^7|^8|^9",
+        "lcobucci/jwt": "^3.4|^4.0",
         "namshi/jose": "^7.0",
         "nesbot/carbon": "^1.0|^2.0"
     },

diff --git a/config/config.php b/config/config.php
@@ -129,12 +129,9 @@
     |
     | Specify the hashing algorithm that will be used to sign the token.
     |
-    | See here: https://github.com/namshi/jose/tree/master/src/Namshi/JOSE/Signer/OpenSSL
-    | for possible values.
-    |
     */
 
-    'algo' => env('JWT_ALGO', 'HS256'),
+    'algo' => env('JWT_ALGO', Tymon\JWTAuth\Providers\JWT\Provider::ALGO_HS256),
 
     /*
     |--------------------------------------------------------------------------

diff --git a/src/Blacklist.php b/src/Blacklist.php
@@ -48,7 +48,6 @@ class Blacklist
      * Constructor.
      *
      * @param  \Tymon\JWTAuth\Contracts\Providers\Storage  $storage
-     *
      * @return void
      */
     public function __construct(Storage $storage)
@@ -60,7 +59,6 @@ public function __construct(Storage $storage)
      * Add the token (jti claim) to the blacklist.
      *
      * @param  \Tymon\JWTAuth\Payload  $payload
-     *
      * @return bool
      */
     public function add(Payload $payload)
@@ -89,7 +87,6 @@ public function add(Payload $payload)
      * Get the number of minutes until the token expiry.
      *
      * @param  \Tymon\JWTAuth\Payload  $payload
-     *
      * @return int
      */
     protected function getMinutesUntilExpired(Payload $payload)
@@ -107,7 +104,6 @@ protected function getMinutesUntilExpired(Payload $payload)
      * Add the token (jti claim) to the blacklist indefinitely.
      *
      * @param  \Tymon\JWTAuth\Payload  $payload
-     *
      * @return bool
      */
     public function addForever(Payload $payload)
@@ -121,7 +117,6 @@ public function addForever(Payload $payload)
      * Determine whether the token has been blacklisted.
      *
      * @param  \Tymon\JWTAuth\Payload  $payload
-     *
      * @return bool
      */
     public function has(Payload $payload)
@@ -141,7 +136,6 @@ public function has(Payload $payload)
      * Remove the token (jti claim) from the blacklist.
      *
      * @param  \Tymon\JWTAuth\Payload  $payload
-     *
      * @return bool
      */
     public function remove(Payload $payload)
@@ -176,7 +170,6 @@ protected function getGraceTimestamp()
      * Set the grace period.
      *
      * @param  int  $gracePeriod
-     *
      * @return $this
      */
     public function setGracePeriod($gracePeriod)
@@ -200,7 +193,6 @@ public function getGracePeriod()
      * Get the unique key held within the blacklist.
      *
      * @param  \Tymon\JWTAuth\Payload  $payload
-     *
      * @return mixed
      */
     public function getKey(Payload $payload)
@@ -212,7 +204,6 @@ public function getKey(Payload $payload)
      * Set the unique key held within the blacklist.
      *
      * @param  string  $key
-     *
      * @return $this
      */
     public function setKey($key)
@@ -226,7 +217,6 @@ public function setKey($key)
      * Set the refresh time limit.
      *
      * @param  int  $ttl
-     *
      * @return $this
      */
     public function setRefreshTTL($ttl)

diff --git a/src/Claims/Claim.php b/src/Claims/Claim.php
@@ -34,7 +34,6 @@ abstract class Claim implements Arrayable, ClaimContract, Jsonable, JsonSerializ
 
     /**
      * @param  mixed  $value
-     *
      * @return void
      */
     public function __construct($value)
@@ -46,10 +45,9 @@ public function __construct($value)
      * Set the claim value, and call a validate method.
      *
      * @param  mixed  $value
+     * @return $this
      *
      * @throws \Tymon\JWTAuth\Exceptions\InvalidClaimException
-     *
-     * @return $this
      */
     public function setValue($value)
     {
@@ -72,7 +70,6 @@ public function getValue()
      * Set the claim name.
      *
      * @param  string  $name
-     *
      * @return $this
      */
     public function setName($name)
@@ -96,7 +93,6 @@ public function getName()
      * Validate the claim in a standalone Claim context.
      *
      * @param  mixed  $value
-     *
      * @return bool
      */
     public function validateCreate($value)
@@ -118,7 +114,6 @@ public function validatePayload()
      * Validate the Claim within a refresh context.
      *
      * @param  int  $refreshTTL
-     *
      * @return bool
      */
     public function validateRefresh($refreshTTL)
@@ -131,7 +126,6 @@ public function validateRefresh($refreshTTL)
      *
      * @param  mixed  $value
      * @param  bool  $strict
-     *
      * @return bool
      */
     public function matches($value, $strict = true)
@@ -144,6 +138,7 @@ public function matches($value, $strict = true)
      *
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->toArray();
@@ -163,7 +158,6 @@ public function toArray()
      * Get the claim as JSON.
      *
      * @param  int  $options
-     *
      * @return string
      */
     public function toJson($options = JSON_UNESCAPED_SLASHES)

diff --git a/src/Claims/Collection.php b/src/Claims/Collection.php
@@ -20,7 +20,6 @@ class Collection extends IlluminateCollection
      * Create a new collection.
      *
      * @param  mixed  $items
-     *
      * @return void
      */
     public function __construct($items = [])
@@ -34,7 +33,6 @@ public function __construct($items = [])
      * @param  string  $name
      * @param  callable  $callback
      * @param  mixed  $default
-     *
      * @return \Tymon\JWTAuth\Claims\Claim
      */
     public function getByClaimName($name, callable $callback = null, $default = null)
@@ -48,7 +46,6 @@ public function getByClaimName($name, callable $callback = null, $default = null
      * Validate each claim under a given context.
      *
      * @param  string  $context
-     *
      * @return $this
      */
     public function validate($context = 'payload')
@@ -70,7 +67,6 @@ public function validate($context = 'payload')
      * Determine if the Collection contains all of the given keys.
      *
      * @param  mixed  $claims
-     *
      * @return bool
      */
     public function hasAllClaims($claims)
@@ -102,7 +98,6 @@ protected function getArrayableItems($items)
      * Ensure that the given claims array is keyed by the claim name.
      *
      * @param  mixed  $items
-     *
      * @return array
      */
     private function sanitizeClaims($items)

diff --git a/src/Claims/Custom.php b/src/Claims/Custom.php
@@ -16,7 +16,6 @@ class Custom extends Claim
     /**
      * @param  string  $name
      * @param  mixed  $value
-     *
      * @return void
      */
     public function __construct($name, $value)

diff --git a/src/Claims/DatetimeTrait.php b/src/Claims/DatetimeTrait.php
@@ -29,10 +29,9 @@ trait DatetimeTrait
      * Set the claim value, and call a validate method.
      *
      * @param  mixed  $value
+     * @return $this
      *
      * @throws \Tymon\JWTAuth\Exceptions\InvalidClaimException
-     *
-     * @return $this
      */
     public function setValue($value)
     {
@@ -63,7 +62,6 @@ public function validateCreate($value)
      * Determine whether the value is in the future.
      *
      * @param  mixed  $value
-     *
      * @return bool
      */
     protected function isFuture($value)
@@ -75,7 +73,6 @@ protected function isFuture($value)
      * Determine whether the value is in the past.
      *
      * @param  mixed  $value
-     *
      * @return bool
      */
     protected function isPast($value)
@@ -87,7 +84,6 @@ protected function isPast($value)
      * Set the leeway in seconds.
      *
      * @param  int  $leeway
-     *
      * @return $this
      */
     public function setLeeway($leeway)

diff --git a/src/Claims/Factory.php b/src/Claims/Factory.php
@@ -57,7 +57,6 @@ class Factory
      * Constructor.
      *
      * @param  \Illuminate\Http\Request  $request
-     *
      * @return void
      */
     public function __construct(Request $request)
@@ -70,7 +69,6 @@ public function __construct(Request $request)
      *
      * @param  string  $name
      * @param  mixed  $value
-     *
      * @return \Tymon\JWTAuth\Claims\Claim
      */
     public function get($name, $value)
@@ -90,7 +88,6 @@ public function get($name, $value)
      * Check whether the claim exists.
      *
      * @param  string  $name
-     *
      * @return bool
      */
     public function has($name)
@@ -102,7 +99,6 @@ public function has($name)
      * Generate the initial value and return the Claim instance.
      *
      * @param  string  $name
-     *
      * @return \Tymon\JWTAuth\Claims\Claim
      */
     public function make($name)
@@ -165,7 +161,6 @@ public function jti()
      *
      * @param  string  $name
      * @param  string  $classPath
-     *
      * @return $this
      */
     public function extend($name, $classPath)
@@ -179,7 +174,6 @@ public function extend($name, $classPath)
      * Set the request instance.
      *
      * @param  \Illuminate\Http\Request  $request
-     *
      * @return $this
      */
     public function setRequest(Request $request)
@@ -193,7 +187,6 @@ public function setRequest(Request $request)
      * Set the token ttl (in minutes).
      *
      * @param  int  $ttl
-     *
      * @return $this
      */
     public function setTTL($ttl)
@@ -217,7 +210,6 @@ public function getTTL()
      * Set the leeway in seconds.
      *
      * @param  int  $leeway
-     *
      * @return $this
      */
     public function setLeeway($leeway)

diff --git a/src/Console/JWTGenerateSecretCommand.php b/src/Console/JWTGenerateSecretCommand.php
@@ -82,7 +82,6 @@ public function handle()
      * Display the key.
      *
      * @param  string  $key
-     *
      * @return void
      */
     protected function displayKey($key)