bring the realpath back (#22)

* bring the realpath back * fix return type * add cs fixer cache * run cs fixer
miladrahimi · Jun 1, 2024 · 675a7fa · 675a7fa
1 parent e8b96a7
commit 675a7fa
Show file tree

Hide file tree

Showing 67 changed files with 220 additions and 91 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,6 @@
 /build
 /vendor
 .DS_Store
+.php-cs-fixer.cache
 .phpunit.result.cache
 composer.lock
diff --git a/src/Base64/Base64Parser.php b/src/Base64/Base64Parser.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Base64;
 

diff --git a/src/Base64/SafeBase64Parser.php b/src/Base64/SafeBase64Parser.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Base64;
 

diff --git a/src/Cryptography/Algorithms/Ecdsa/AbstractEcdsaSigner.php b/src/Cryptography/Algorithms/Ecdsa/AbstractEcdsaSigner.php
@@ -1,10 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Ecdsa;
 
 use MiladRahimi\Jwt\Cryptography\Keys\EcdsaPrivateKey;
 use MiladRahimi\Jwt\Cryptography\Signer;
 use MiladRahimi\Jwt\Exceptions\SigningException;
+
 use function ltrim;
 use function ord;
 use function str_pad;

diff --git a/src/Cryptography/Algorithms/Ecdsa/AbstractEcdsaVerifier.php b/src/Cryptography/Algorithms/Ecdsa/AbstractEcdsaVerifier.php
@@ -1,10 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Ecdsa;
 
 use MiladRahimi\Jwt\Cryptography\Keys\EcdsaPublicKey;
 use MiladRahimi\Jwt\Cryptography\Verifier;
 use MiladRahimi\Jwt\Exceptions\InvalidSignatureException;
+
 use function chr;
 use function ltrim;
 use function ord;

diff --git a/src/Cryptography/Algorithms/Ecdsa/Algorithm.php b/src/Cryptography/Algorithms/Ecdsa/Algorithm.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Ecdsa;
 

diff --git a/src/Cryptography/Algorithms/Ecdsa/ES256KVerifier.php b/src/Cryptography/Algorithms/Ecdsa/ES256KVerifier.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Ecdsa;
 

diff --git a/src/Cryptography/Algorithms/Ecdsa/ES256Signer.php b/src/Cryptography/Algorithms/Ecdsa/ES256Signer.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Ecdsa;
 

diff --git a/src/Cryptography/Algorithms/Ecdsa/ES256Verifier.php b/src/Cryptography/Algorithms/Ecdsa/ES256Verifier.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Ecdsa;
 

diff --git a/src/Cryptography/Algorithms/Ecdsa/ES384Signer.php b/src/Cryptography/Algorithms/Ecdsa/ES384Signer.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Ecdsa;
 

diff --git a/src/Cryptography/Algorithms/Ecdsa/ES384Verifier.php b/src/Cryptography/Algorithms/Ecdsa/ES384Verifier.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Ecdsa;
 

diff --git a/src/Cryptography/Algorithms/Eddsa/EdDsaSigner.php b/src/Cryptography/Algorithms/Eddsa/EdDsaSigner.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Eddsa;
 
@@ -7,6 +9,7 @@
 use MiladRahimi\Jwt\Exceptions\SigningException;
 use RuntimeException;
 use SodiumException;
+
 use function function_exists;
 
 class EdDsaSigner implements Signer

diff --git a/src/Cryptography/Algorithms/Eddsa/EdDsaVerifier.php b/src/Cryptography/Algorithms/Eddsa/EdDsaVerifier.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Eddsa;
 

diff --git a/src/Cryptography/Algorithms/Hmac/AbstractHmac.php b/src/Cryptography/Algorithms/Hmac/AbstractHmac.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Hmac;
 

diff --git a/src/Cryptography/Algorithms/Hmac/HS256.php b/src/Cryptography/Algorithms/Hmac/HS256.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Hmac;
 

diff --git a/src/Cryptography/Algorithms/Hmac/HS384.php b/src/Cryptography/Algorithms/Hmac/HS384.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Hmac;
 

diff --git a/src/Cryptography/Algorithms/Hmac/HS512.php b/src/Cryptography/Algorithms/Hmac/HS512.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Hmac;
 

diff --git a/src/Cryptography/Algorithms/Rsa/AbstractRsaSigner.php b/src/Cryptography/Algorithms/Rsa/AbstractRsaSigner.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Rsa;
 

diff --git a/src/Cryptography/Algorithms/Rsa/AbstractRsaVerifier.php b/src/Cryptography/Algorithms/Rsa/AbstractRsaVerifier.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Rsa;
 

diff --git a/src/Cryptography/Algorithms/Rsa/Algorithm.php b/src/Cryptography/Algorithms/Rsa/Algorithm.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Rsa;
 

diff --git a/src/Cryptography/Algorithms/Rsa/RS256Signer.php b/src/Cryptography/Algorithms/Rsa/RS256Signer.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Rsa;
 

diff --git a/src/Cryptography/Algorithms/Rsa/RS256Verifier.php b/src/Cryptography/Algorithms/Rsa/RS256Verifier.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Rsa;
 

diff --git a/src/Cryptography/Algorithms/Rsa/RS384Signer.php b/src/Cryptography/Algorithms/Rsa/RS384Signer.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Rsa;
 

diff --git a/src/Cryptography/Algorithms/Rsa/RS384Verifier.php b/src/Cryptography/Algorithms/Rsa/RS384Verifier.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Rsa;
 

diff --git a/src/Cryptography/Algorithms/Rsa/RS512Signer.php b/src/Cryptography/Algorithms/Rsa/RS512Signer.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Rsa;
 

diff --git a/src/Cryptography/Algorithms/Rsa/RS512Verifier.php b/src/Cryptography/Algorithms/Rsa/RS512Verifier.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Algorithms\Rsa;
 

diff --git a/src/Cryptography/Keys/EcdsaPrivateKey.php b/src/Cryptography/Keys/EcdsaPrivateKey.php
@@ -1,14 +1,15 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Keys;
 
 use MiladRahimi\Jwt\Exceptions\InvalidKeyException;
-use Throwable;
 
 class EcdsaPrivateKey
 {
     /**
-     * @var mixed Key file resource handler
+     * @var resource Key resource handler
      */
     protected $resource;
 
@@ -23,7 +24,7 @@ class EcdsaPrivateKey
      */
     public function __construct(string $key, string $passphrase = '', ?string $id = null)
     {
-        $content = file_exists($key) ? file_get_contents($key) : $key;
+        $content = file_exists($key) ? file_get_contents(realpath($key)) : $key;
 
         $this->resource = openssl_pkey_get_private($content, $passphrase);
         if ($this->resource === false) {
@@ -34,7 +35,7 @@ public function __construct(string $key, string $passphrase = '', ?string $id =
     }
 
     /**
-     * @return mixed
+     * @return resource
      */
     public function getResource()
     {

diff --git a/src/Cryptography/Keys/EcdsaPublicKey.php b/src/Cryptography/Keys/EcdsaPublicKey.php
@@ -1,14 +1,15 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Keys;
 
 use MiladRahimi\Jwt\Exceptions\InvalidKeyException;
-use Throwable;
 
 class EcdsaPublicKey
 {
     /**
-     * @var mixed Key file resource handler
+     * @var resource Key resource handler
      */
     protected $resource;
 
@@ -22,7 +23,7 @@ class EcdsaPublicKey
      */
     public function __construct(string $key, ?string $id = null)
     {
-        $content = file_exists($key) ? file_get_contents($key) : $key;
+        $content = file_exists($key) ? file_get_contents(realpath($key)) : $key;
 
         $this->resource = openssl_pkey_get_public($content);
         if ($this->resource === false) {
@@ -33,7 +34,7 @@ public function __construct(string $key, ?string $id = null)
     }
 
     /**
-     * @return mixed
+     * @return resource
      */
     public function getResource()
     {

diff --git a/src/Cryptography/Keys/EdDsaPrivateKey.php b/src/Cryptography/Keys/EdDsaPrivateKey.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Keys;
 

diff --git a/src/Cryptography/Keys/EdDsaPublicKey.php b/src/Cryptography/Keys/EdDsaPublicKey.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Keys;
 

diff --git a/src/Cryptography/Keys/HmacKey.php b/src/Cryptography/Keys/HmacKey.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Keys;
 

diff --git a/src/Cryptography/Keys/RsaPrivateKey.php b/src/Cryptography/Keys/RsaPrivateKey.php
@@ -1,14 +1,15 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace MiladRahimi\Jwt\Cryptography\Keys;
 
 use MiladRahimi\Jwt\Exceptions\InvalidKeyException;
-use Throwable;
 
 class RsaPrivateKey
 {
     /**
-     * @var mixed Key file resource handler
+     * @var resource Key resource handler
      */
     protected $resource;
 
@@ -23,7 +24,7 @@ class RsaPrivateKey
      */
     public function __construct(string $key, string $passphrase = '', ?string $id = null)
     {
-        $content = file_exists($key) ? file_get_contents($key) : $key;
+        $content = file_exists($key) ? file_get_contents(realpath($key)) : $key;
 
         $this->resource = openssl_pkey_get_private($content, $passphrase);
         if ($this->resource === false) {
@@ -34,7 +35,7 @@ public function __construct(string $key, string $passphrase = '', ?string $id =
     }
 
     /**
-     * @return mixed
+     * @return resource
      */
     public function getResource()
     {