francis94c / ci-jwt

helpers/base64_helper.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
    *
    * @return string|bool          Decoded String.
    */
-  function base64url_decode(string $data, bool $strict=false) {
+  function base64url_decode(string $data, bool $strict = false) {
     $b64 = strtr($data, '-_', '+/');
     return base64_decode($b64, $strict);
   }

Braces +3 added lines, -1 removed lines

@@ -11,7 +11,9 @@
    */
   function base64url_encode(string $data) {
     $b64 = base64_encode($data);
-    if ($b64 === false) return false;
+    if ($b64 === false) {
+     return false;
+    }
     $url = strtr($b64, '+/', '-_');
     return rtrim($url, '=');
   }

phpunit/JWTTest.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
    * @covers JWT::__construct
    */
   public static function setUpBeforeClass(): void {
-    self::$ci =& get_instance();
+    self::$ci = & get_instance();
     /**
      * [$params Config Items.]
      *

libraries/JWT.php

Spacing +13 added lines, -13 removed lines

@@ -69,7 +69,7 @@ 
    * @date  2020-03-28
    * @param [type] $params Config array.
    */
-  public function __construct(?array $params=null)
+  public function __construct(?array $params = null)
   {
     if ($params != null) $this->init($params);
     get_instance()->load->splint("francis94c/ci-jwt", "%base64");
@@ -110,7 +110,7 @@ 
    *                         if specified, or the header array if no key is
    *                         specified. Method chaining is supported.
    */
-  public function header(?string $key=null, $value=null)
+  public function header(?string $key = null, $value = null)
   {
     if (!$key) return $this->header;
     if ($value === null) return $this->header[$key];
@@ -136,7 +136,7 @@ 
    * @return mixed|null Value of $key if $value == null, payload array if $key
    *                    == null. Method chaining supported.
    */
-  public function payload(?string $key=null, $value=null)
+  public function payload(?string $key = null, $value = null)
   {
     if (!$key) return $this->payload;
     if ($value === null) return $this->payload[$key];
@@ -164,7 +164,7 @@ 
    * @return mixed|none      Value of the 'iss' claim, if the $iss argument wasn't
    *                         supplied. Otherwise, null.
    */
-  public function iss(string $iss=null)
+  public function iss(string $iss = null)
   {
     if ($iss === null) return $this->payload['iss'];
     $this->payload['iss'] = $iss;
@@ -197,9 +197,9 @@ 
    * @param  [type] $secret [description]
    * @return [type]         [description]
    */
-  public function sign(string $secret=null):?string {
+  public function sign(string $secret = null): ?string {
     // Checks.
-    if  (count($this->payload) == 0) return null;
+    if (count($this->payload) == 0) return null;
     // $key is $secret.
     $key = $secret ?? $this->secret;
     $this->header["alg"] = $this->header["alg"] ?? ($this->algorithm ?? self::HS512);
@@ -221,10 +221,10 @@ 
    * [token description]
    * @return string [description]
    */
-  public function token():?string
+  public function token(): ?string
   {
     // Checks.
-    if  (count($this->payload) == 0) return null;
+    if (count($this->payload) == 0) return null;
     // Begin.
     $this->header["alg"] = self::NONE;
     if ($this->set_iat) $this->payload["iat"] = $this->payload["iat"] ?? time();
@@ -238,14 +238,14 @@ 
    * @param  string $secret [description]
    * @return bool           [description]
    */
-  public function verify(string $jwt, string $secret=null):bool {
+  public function verify(string $jwt, string $secret = null):bool {
     if (substr_count($jwt, ".") != 2) return false; // Invalid JWT.
     $key = $secret ?? $this->secret;
     $parts = explode(".", $jwt);
-    $header = json_decode(base64url_decode($parts[0]) ,true);
+    $header = json_decode(base64url_decode($parts[0]), true);
     if ($header == null) return false;
     $alg = $this->algorithm ?? $header["alg"] ?? self::HS256;
-    $payload = json_decode(base64url_decode($parts[1]) ,true);
+    $payload = json_decode(base64url_decode($parts[1]), true);
     if ($payload == null) return false;
     if ($parts[2] == "") {
       return $this->allow_unsigned;
@@ -285,7 +285,7 @@ 
    * @param  string $jwt [description]
    * @return bool        [description]
    */
-  public function expired(string $jwt=null):bool {
+  public function expired(string $jwt = null):bool {
     $exp = $jwt == null ? ($this->payload["exp"] ?? time() + 4) : $this->get_expired($jwt);
     return time() >= $exp;
   }
@@ -310,7 +310,7 @@ 
   private function get_expired(string $jwt):int
   {
     $parts = explode(".", $jwt);
-    return json_decode(base64url_decode($parts[1]) ,true)["exp"] ?? time() + 4;
+    return json_decode(base64url_decode($parts[1]), true)["exp"] ?? time() + 4;
   }
 
   /**

Braces +67 added lines, -22 removed lines

@@ -71,7 +71,9 @@ 
    */
   public function __construct(?array $params=null)
   {
-    if ($params != null) $this->init($params);
+    if ($params != null) {
+     $this->init($params);
+    }
     get_instance()->load->splint("francis94c/ci-jwt", "%base64");
   }
 
@@ -112,8 +114,12 @@ 
    */
   public function header(?string $key=null, $value=null)
   {
-    if (!$key) return $this->header;
-    if ($value === null) return $this->header[$key];
+    if (!$key) {
+     return $this->header;
+    }
+    if ($value === null) {
+     return $this->header[$key];
+    }
     $this->header[$key] = $value;
     return $this;
   }
@@ -138,8 +144,12 @@ 
    */
   public function payload(?string $key=null, $value=null)
   {
-    if (!$key) return $this->payload;
-    if ($value === null) return $this->payload[$key];
+    if (!$key) {
+     return $this->payload;
+    }
+    if ($value === null) {
+     return $this->payload[$key];
+    }
     $this->payload[$key] = $value;
     return $this;
   }
@@ -153,7 +163,9 @@ 
    */
   public function __call(string $method, array $args)
   {
-    if (count($args) == 0) return $this->payload[$method];
+    if (count($args) == 0) {
+     return $this->payload[$method];
+    }
     $this->payload[$method] = $args[0];
     return $this;
   }
@@ -166,7 +178,9 @@ 
    */
   public function iss(string $iss=null)
   {
-    if ($iss === null) return $this->payload['iss'];
+    if ($iss === null) {
+     return $this->payload['iss'];
+    }
     $this->payload['iss'] = $iss;
     return $this;
   }
@@ -199,21 +213,33 @@ 
    */
   public function sign(string $secret=null):?string {
     // Checks.
-    if  (count($this->payload) == 0) return null;
+    if  (count($this->payload) == 0) {
+     return null;
+    }
     // $key is $secret.
     $key = $secret ?? $this->secret;
     $this->header["alg"] = $this->header["alg"] ?? ($this->algorithm ?? self::HS512);
     $this->header["typ"] = $this->header["typ"] ?? self::JWT;
     // Generate Issued At Time.
-    if ($this->set_iat) $this->payload["iat"] = $this->payload['iat'] ?? time();
+    if ($this->set_iat) {
+     $this->payload["iat"] = $this->payload['iat'] ?? time();
+    }
     // Auto Expire.
-    if ($this->auto_expire != null && !isset($this->payload['exp'])) $this->payload['exp'] = strtotime($this->auto_expire);
+    if ($this->auto_expire != null && !isset($this->payload['exp'])) {
+     $this->payload['exp'] = strtotime($this->auto_expire);
+    }
     $jwt = base64url_encode(json_encode($this->header));
-    if ($jwt === false) return null;
-    if ($jwt != "") $jwt .= ".";
+    if ($jwt === false) {
+     return null;
+    }
+    if ($jwt != "") {
+     $jwt .= ".";
+    }
     $payload = base64url_encode(json_encode($this->payload));
     $jwt .= $payload;
-    if ($key != "") return $this->sign_token($jwt, $key, $this->header["alg"]);
+    if ($key != "") {
+     return $this->sign_token($jwt, $key, $this->header["alg"]);
+    }
     return $jwt . ".";
   }
 
@@ -224,11 +250,17 @@ 
   public function token():?string
   {
     // Checks.
-    if  (count($this->payload) == 0) return null;
+    if  (count($this->payload) == 0) {
+     return null;
+    }
     // Begin.
     $this->header["alg"] = self::NONE;
-    if ($this->set_iat) $this->payload["iat"] = $this->payload["iat"] ?? time();
-    if ($this->auto_expire != null) $this->payload["exp"] = strtotime($this->auto_expire);
+    if ($this->set_iat) {
+     $this->payload["iat"] = $this->payload["iat"] ?? time();
+    }
+    if ($this->auto_expire != null) {
+     $this->payload["exp"] = strtotime($this->auto_expire);
+    }
     return base64url_encode(json_encode($this->header)) . "." . base64url_encode(json_encode($this->payload)) . ".";
   }
 
@@ -239,14 +271,21 @@ 
    * @return bool           [description]
    */
   public function verify(string $jwt, string $secret=null):bool {
-    if (substr_count($jwt, ".") != 2) return false; // Invalid JWT.
+    if (substr_count($jwt, ".") != 2) {
+     return false;
+    }
+    // Invalid JWT.
     $key = $secret ?? $this->secret;
     $parts = explode(".", $jwt);
     $header = json_decode(base64url_decode($parts[0]) ,true);
-    if ($header == null) return false;
+    if ($header == null) {
+     return false;
+    }
     $alg = $this->algorithm ?? $header["alg"] ?? self::HS256;
     $payload = json_decode(base64url_decode($parts[1]) ,true);
-    if ($payload == null) return false;
+    if ($payload == null) {
+     return false;
+    }
     if ($parts[2] == "") {
       return $this->allow_unsigned;
     }
@@ -273,9 +312,13 @@ 
   public function decode(string $jwt):bool {
     $parts = explode(".", $jwt);
     $header = json_decode(base64url_decode($parts[0]), true);
-    if ($header === false) return false;
+    if ($header === false) {
+     return false;
+    }
     $payload = json_decode(base64url_decode($parts[1]), true);
-    if ($payload === false) return false;
+    if ($payload === false) {
+     return false;
+    }
     $this->header = $header;
     $this->payload = $payload;
     return true;
@@ -322,7 +365,9 @@ 
    */
   private function sign_token(string $token, string $key, string $alg):string
   {
-    if ($alg == self::NONE) return $token . ".";
+    if ($alg == self::NONE) {
+     return $token . ".";
+    }
     $token = rtrim($token, ".");
     $signature = hash_hmac(self::ALGOS[$alg], $token, $key);
     return $token . "." . $signature;