Apply fixes from StyleCI

src/Secrets/Secret.php

@@ -4,5 +4,4 @@
 
 interface Secret
 {
-
 }

src/Signer/Hs/Hs256Signer.php

@@ -13,4 +13,4 @@ public function algorithm(): string
     {
         return 'HS256';
     }
-}
+}

src/Signer/Hs/Hs384Signer.php

@@ -13,4 +13,4 @@ public function algorithm(): string
     {
         return 'HS384';
     }
-}
+}

src/Signer/Hs/Hs512Signer.php

@@ -13,4 +13,4 @@ public function algorithm(): string
     {
         return 'HS512';
     }
-}
+}

src/Signer/Rs/Rs384Signer.php

@@ -4,7 +4,6 @@
 
 class Rs384Signer extends RsSigner
 {
-
     /**
      * @var int
      */

src/Signer/Rs/Rs512Signer.php

@@ -4,7 +4,6 @@
 
 class Rs512Signer extends RsSigner
 {
-
     /**
      * @var int
      */

src/Signer/Rs/RsSigner.php

@@ -26,11 +26,14 @@ public function sign(string $header, string $payload): mixed
         $secret = $this->getSecret();
         $signature = null;
         $signed = openssl_sign(
-            "$header.$payload", $signature, $secret->privateKey, $this->openSslAlgorithm
+            "$header.$payload",
+            $signature,
+            $secret->privateKey,
+            $this->openSslAlgorithm
         );
 
         if (!$signed) {
-            throw new RuntimeException("Failed to create signature");
+            throw new RuntimeException('Failed to create signature');
         }
 
         return $signature;

src/Signer/Signer.php

@@ -33,7 +33,7 @@ public function getSecret(): Secret|null
     public function setSecret(Secret $secret): void
     {
         if (!$this->validateSecret($secret)) {
-            throw new InvalidArgumentException("Invalid secret provided");
+            throw new InvalidArgumentException('Invalid secret provided');
         }
 
         $this->secret = $secret;

src/SignerFactory.php

@@ -40,6 +40,7 @@ public static function assign(string $algorithm, string $className): void
      * @param string $algorithm
      *
      * @throws Exception
+     *
      * @return Signer
      */
     public static function build(string $algorithm): Signer
@@ -49,6 +50,7 @@ public static function build(string $algorithm): Signer
         }
 
         $className = self::$algorithmMap[$algorithm];
-        return new $className;
+
+        return new $className();
     }
 }

src/Token.php

@@ -12,9 +12,6 @@
 
 class Token
 {
-    /**
-     *
-     */
     public const DEFAULT_SIGNER = Hs256Signer::class;
 
     /**
@@ -75,6 +72,7 @@ public function __construct()
     public function assignValidator(Validator $validator): Token
     {
         $this->validators[$validator->validates()] = $validator;
+
         return $this;
     }
 
@@ -85,11 +83,12 @@ private static function getDefaultSigner(): Signer
     {
         $signer = self::DEFAULT_SIGNER;
 
-        return new $signer;
+        return new $signer();
     }
 
     /**
      * @throws Exception
+     *
      * @return Token
      */
     public static function fromAuthorizationBearer(): Token
@@ -121,7 +120,6 @@ public static function fromAuthorizationBearer(): Token
             throw new Exception('Authorization header is not set');
         }
 
-
         $matches = [];
         if (!preg_match('/Bearer\s((.*)\.(.*)\.(.*))/', $authorizationHeader, $matches)) {
             throw new Exception('Invalid "Authorization" header value');
@@ -134,6 +132,7 @@ public static function fromAuthorizationBearer(): Token
      * @param string $token
      *
      * @throws Exception
+     *
      * @return Token
      */
     public static function fromString(string $token): Token
@@ -177,6 +176,7 @@ private static function decodeSection(string $encoded): string
     public function withSigner(Signer $signer): Token
     {
         $this->signer = $signer;
+
         return $this->withHeader('alg', $signer->algorithm());
     }
 
@@ -189,6 +189,7 @@ public function withSigner(Signer $signer): Token
     public function withHeader(string $index, mixed $value): Token
     {
         $this->headers[$index] = $value;
+
         return $this;
     }
 
@@ -200,6 +201,7 @@ public function withHeader(string $index, mixed $value): Token
     public function setSignature(string $signature): Token
     {
         $this->signature = $signature;
+
         return $this;
     }
 
@@ -215,6 +217,7 @@ public static function create(): Token
      * @param $param
      *
      * @throws Exception
+     *
      * @return Token
      */
     public static function fromQueryString($param = 'token'): Token
@@ -232,6 +235,7 @@ public static function fromQueryString($param = 'token'): Token
     public function assignHeaderValidator(Validator $validator): Token
     {
         $this->headerValidators[$validator->validates()] = $validator;
+
         return $this;
     }
 
@@ -257,6 +261,7 @@ public function getHeaders(string $index = null): mixed
     public function setHeaders(array $headers): Token
     {
         $this->headers = $headers;
+
         return $this;
     }
 
@@ -282,6 +287,7 @@ public function getPayload(string $index = null): mixed
     public function setPayload(array $payload): Token
     {
         $this->payload = $payload;
+
         return $this;
     }
 
@@ -301,6 +307,7 @@ public function getLastValidationIssue(): ?string
     public function remove(string $index): Token
     {
         unset($this->payload[$index]);
+
         return $this;
     }
 
@@ -312,6 +319,7 @@ public function remove(string $index): Token
     public function removeHeader(string $index): Token
     {
         unset($this->headers[$index]);
+
         return $this;
     }
 
@@ -350,6 +358,7 @@ public function validate(Secret $secret): bool
 
             if (isset($this->headers[$i]) && !$validator->validate($this->headers[$i])) {
                 $this->lastValidationIssue = "Header '$i' value is invalid.";
+
                 return false;
             }
         }
@@ -360,6 +369,7 @@ public function validate(Secret $secret): bool
 
             if (isset($this->payload[$i]) && !$validator->validate($this->payload[$i])) {
                 $this->lastValidationIssue = "Payload field '$i' value is invalid.";
+
                 return false;
             }
         }
@@ -374,7 +384,7 @@ public function validate(Secret $secret): bool
         $valid = $signer->verify($headers, $payload, $this->signature);
 
         if (!$valid) {
-            $this->lastValidationIssue = "Token signature is invalid.";
+            $this->lastValidationIssue = 'Token signature is invalid.';
         }
 
         return $valid;
@@ -406,6 +416,7 @@ public function sign(mixed $secret): Token
     public function with(string $index, mixed $value): Token
     {
         $this->payload[$index] = $value;
+
         return $this;
     }
 }

src/Validator/EqualityValidator.php

@@ -2,8 +2,6 @@
 
 namespace Webdevcave\Jwt\Validator;
 
-use Webdevcave\Jwt\Validator\Validator;
-
 abstract class EqualityValidator extends Validator
 {
     /**

src/Validator/ExpValidator.php

@@ -4,19 +4,18 @@
 
 class ExpValidator extends Validator
 {
-
     /**
      * @inheritDoc
      */
-    function validates(): string
+    public function validates(): string
     {
         return 'exp';
     }
 
     /**
      * @inheritDoc
      */
-    function validate(mixed $value): bool
+    public function validate(mixed $value): bool
     {
         return $value > time();
     }

src/Validator/NbfValidator.php

@@ -4,20 +4,19 @@
 
 class NbfValidator extends Validator
 {
-
     /**
      * @inheritDoc
      */
-    function validates(): string
+    public function validates(): string
     {
         return 'nbf';
     }
 
     /**
      * @inheritDoc
      */
-    function validate(mixed $value): bool
+    public function validate(mixed $value): bool
     {
         return $value <= time();
     }
-}
+}

src/Validator/Validator.php

@@ -5,7 +5,7 @@
 abstract class Validator
 {
     /**
-     * Must return the validated field name;
+     * Must return the validated field name;.
      *
      * @return string
      */

tests/Signer/Rs/RsSignerTest.php

@@ -3,14 +3,12 @@
 namespace Webdevcave\Jwt\Tests\Signer\Rs;
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\TestCase;
 use RuntimeException;
 use Webdevcave\Jwt\Secrets\RsSecret;
 use Webdevcave\Jwt\Signer\Rs\Rs256Signer;
 use Webdevcave\Jwt\Signer\Rs\RsSigner;
-use PHPUnit\Framework\TestCase;
 use Webdevcave\Jwt\Signer\Signer;
-use Webdevcave\Jwt\SignerFactory;
-use Webdevcave\Jwt\Token;
 
 #[CoversClass(RsSecret::class)]
 #[CoversClass(RsSigner::class)]

tests/SignerFactoryTest.php

@@ -4,14 +4,14 @@
 
 use Exception;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\TestCase;
 use Webdevcave\Jwt\Signer\Hs\Hs256Signer;
 use Webdevcave\Jwt\Signer\Hs\Hs384Signer;
 use Webdevcave\Jwt\Signer\Hs\Hs512Signer;
 use Webdevcave\Jwt\Signer\Rs\Rs256Signer;
 use Webdevcave\Jwt\Signer\Rs\Rs384Signer;
 use Webdevcave\Jwt\Signer\Rs\Rs512Signer;
 use Webdevcave\Jwt\SignerFactory;
-use PHPUnit\Framework\TestCase;
 use Webdevcave\Jwt\Tests\CustomSigner\MyCustomSigner;
 
 #[CoversClass(SignerFactory::class)]

tests/TokenTest.php

@@ -4,6 +4,7 @@
 
 use Exception;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\TestCase;
 use Webdevcave\Jwt\Secrets\HsSecret;
 use Webdevcave\Jwt\Secrets\RsSecret;
 use Webdevcave\Jwt\Signer\Hs\Hs256Signer;
@@ -17,7 +18,6 @@
 use Webdevcave\Jwt\Signer\Signer;
 use Webdevcave\Jwt\SignerFactory;
 use Webdevcave\Jwt\Token;
-use PHPUnit\Framework\TestCase;
 use Webdevcave\Jwt\Validator\AudValidator;
 use Webdevcave\Jwt\Validator\EqualityValidator;
 use Webdevcave\Jwt\Validator\ExpValidator;

tests/Validator/IssValidatorTest.php

@@ -4,8 +4,8 @@
 
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
-use Webdevcave\Jwt\Validator\IssValidator;
 use Webdevcave\Jwt\Validator\EqualityValidator;
+use Webdevcave\Jwt\Validator\IssValidator;
 
 #[CoversClass(IssValidator::class)]
 #[CoversClass(EqualityValidator::class)]
@@ -14,10 +14,9 @@ class IssValidatorTest extends TestCase
     public function testValidate()
     {
         $validator = new IssValidator('issuer');
-        
+
         $this->assertEquals('iss', $validator->validates());
         $this->assertTrue($validator->validate('issuer'));
         $this->assertFalse($validator->validate('not-issuer'));
     }
-
 }

tests/Validator/SubValidatorTest.php

@@ -4,8 +4,8 @@
 
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
-use Webdevcave\Jwt\Validator\SubValidator;
 use Webdevcave\Jwt\Validator\EqualityValidator;
+use Webdevcave\Jwt\Validator\SubValidator;
 
 #[CoversClass(SubValidator::class)]
 #[CoversClass(EqualityValidator::class)]
@@ -14,10 +14,9 @@ class SubValidatorTest extends TestCase
     public function testValidate()
     {
         $validator = new SubValidator('sub');
-        
+
         $this->assertEquals('sub', $validator->validates());
         $this->assertTrue($validator->validate('sub'));
         $this->assertFalse($validator->validate('not-sub'));
     }
-
 }