4.0.0 beta

.github/workflows/ci.yml

@@ -4,10 +4,12 @@ on: [push, pull_request, release]
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         php-versions: ['7.4', '8.0']
+        os: [ubuntu-18.04, ubuntu-20.04]
     name: PHP ${{ matrix.php-versions }} Test
     steps:
     - name: Checkout
@@ -23,9 +25,14 @@ jobs:
     - name: Validate Composer
       run: composer validate --strict
 
-    - name: Install Composer Dependencies
+    - name: Install Composer Dependencies PHP 7.4
+      if: ${{ matrix.php-versions == '7.4' }}
       run: composer install --no-interaction --prefer-dist
 
+    - name: Install Composer Dependencies PHP 8.0
+      if: ${{ matrix.php-versions == '8.0' }}
+      run: composer install --no-interaction --prefer-dist --ignore-platform-reqs
+
     - name: Run Tests
       run: composer run-script pipeline
       env:

benchmarks/ReallySimpleJWTBench.php

@@ -5,19 +5,26 @@
 use ReallySimpleJWT\Build;
 use ReallySimpleJWT\Validate;
 use ReallySimpleJWT\Secret;
-use ReallySimpleJWT\Encode;
 use ReallySimpleJWT\Parse;
 use ReallySimpleJWT\Jwt;
+use ReallySimpleJWT\Encoders\EncodeHs256;
+use ReallySimpleJWT\Decoders\DecodeHs256;
+use ReallySimpleJWT\Helper\Validator;
 
 class ReallySimpleJWTBench
 {
     /**
      * @Revs(2500)
      * @Iterations(20)
      */
-    public function benchCreateToken()
+    public function benchCreateToken(): void
     {
-        $build = new Build('JWT', new Validate(), new Secret(), new Encode());
+        $build = new Build(
+            'JWT',
+            new Validator(),
+            new Secret(),
+            new EncodeHs256()
+        );
 
         $expiration = time() + 10;
         $notBefore = time() - 10;
@@ -41,28 +48,29 @@ public function benchCreateToken()
      * @Revs(2500)
      * @Iterations(20)
      */
-    public function benchParseToken()
+    public function benchParseToken(): void
     {
         $token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.' .
         'eyJhdWQiOiJodHRwczovL2dvb2dsZS5jb20iLCJuYW1lIjoiQ2hyaXMiLCJpYXQiOjE1MTYyMzkwMjJ9.' .
         'dA-VMA__ZkvaLjSui-dOgNi23KLU52Y--_dutVvohio';
 
-        $parse = new Parse(
-            new Jwt($token, '123$car*PARK456'),
-            new Validate(),
-            new Encode()
-        );
+        $parse = new Parse(new Jwt($token, '123$car*PARK456'), new DecodeHs256());
 
-        $parse->validate()->parse();
+        $parse->parse();
     }
 
     /**
      * @Revs(1250)
      * @Iterations(10)
      */
-    public function benchBuildAndParse()
+    public function benchBuildAndParse(): void
     {
-        $build = new Build('JWT', new Validate(), new Secret(), new Encode());
+        $build = new Build(
+            'JWT',
+            new Validator(),
+            new Secret(),
+            new EncodeHs256()
+        );
 
         $expiration = time() + 10;
         $notBefore = time() - 10;
@@ -81,15 +89,8 @@ public function benchBuildAndParse()
             ->setPayloadClaim('uid', 2)
             ->build();
 
-        $parse = new Parse(
-            $token,
-            new Validate(),
-            new Encode()
-        );
+        $parse = new Parse($token, new DecodeHs256());
 
-        $parse->validate()
-            ->validateExpiration()
-            ->validateNotBefore()
-            ->parse();
+        $parse->parse();
     }
 }

composer.json

@@ -14,11 +14,11 @@
         "php": ">=7.4.0"
     },
     "require-dev": {
-    	"phpunit/phpunit": "9.2.*",
+    	"phpunit/phpunit": "^9.5",
         "phpstan/phpstan": "^0.12",
-        "phpmd/phpmd": "^2.8",
+        "phpmd/phpmd": "^2.9",
         "squizlabs/php_codesniffer": "^3.5",
-        "infection/infection": "^0.16",
+        "infection/infection": "^0.20",
         "phploc/phploc": "^7.0",
         "sebastian/phpcpd": "^6.0",
         "phpbench/phpbench": "^0.17"
@@ -37,10 +37,11 @@
     "scripts" : {
         "pipeline": [
             "vendor/bin/phpcs --standard=psr12 src/ tests/ benchmarks/",
-            "vendor/bin/phpstan analyse -l 7 src/ tests/",
+            "vendor/bin/phpstan analyse -l 8 src/ tests/ benchmarks/",
             "vendor/bin/phpmd src/ text ruleset.xml",
-            "vendor/bin/phpunit --coverage-clover=coverage.xml",
-            "vendor/bin/infection -s --min-msi=95 --threads=2",
+            "vendor/bin/phpunit --testsuite unit --coverage-clover=coverage.xml",
+            "vendor/bin/phpunit --testsuite integration",
+            "vendor/bin/infection --test-framework-options='--testsuite unit' -s --min-msi=93 --threads=2",
             "vendor/bin/phpcpd --min-lines=2 --min-tokens=35 src/",
             "vendor/bin/phpbench run benchmarks/ReallySimpleJWTBench.php --report=aggregate",
             "vendor/bin/phploc src/"

phpunit.xml

@@ -13,8 +13,11 @@
          failOnRisky="true"
          failOnWarning="true">
     <testsuites>
-        <testsuite name="Really Simple JWT Test Suite">
-            <directory suffix=".php">./tests/</directory>
+        <testsuite name="unit">
+            <directory suffix=".php">./tests/Unit/</directory>
+        </testsuite>
+        <testsuite name="integration">
+            <directory suffix=".php">./tests/Integration/</directory>
         </testsuite>
     </testsuites>
     <filter>