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 +12 added lines, -12 removed lines

@@ -55,7 +55,7 @@ 
    */
   private $algorithm;
 
-  function __construct($params=null) {
+  function __construct($params = null) {
     if ($params != null) $this->init($params);
     get_instance()->load->splint("francis94c/ci-jwt", "%base64");
   }
@@ -75,7 +75,7 @@ 
    * @param  string     $key   Key of the item. e.g "alg", "typ".
    * @param  string|int $value Value of the item.
    */
-  public function header(string $key, $value=null) {
+  public function header(string $key, $value = null) {
     if ($value === null) return $this->header[$key];
     $this->header[$key] = $value;
   }
@@ -92,7 +92,7 @@ 
    * @param  string|int      $value JWT Claim Value.
    * @return string|int|null Value of $key if $value == null, else returns null.
    */
-  public function payload(string $key, $value=null) {
+  public function payload(string $key, $value = null) {
     if ($value === null) return $this->payload[$key];
     $this->payload[$key] = $value;
   }
@@ -116,9 +116,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);
@@ -139,9 +139,9 @@ 
    * [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();
@@ -154,14 +154,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 = $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;
@@ -198,7 +198,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()) : $this->get_expired($jwt);
     return time() >= $exp;
   }
@@ -220,7 +220,7 @@ 
    */
   private function get_expired(string $jwt):int {
     $parts = explode(".", $jwt);
-    return json_decode(base64url_decode($parts[1]) ,true)["exp"] ?? time();
+    return json_decode(base64url_decode($parts[1]), true)["exp"] ?? time();
   }
   /**
    * [sign_token Sign JWT]

Braces +55 added lines, -18 removed lines

@@ -56,7 +56,9 @@ 
   private $algorithm;
 
   function __construct($params=null) {
-    if ($params != null) $this->init($params);
+    if ($params != null) {
+     $this->init($params);
+    }
     get_instance()->load->splint("francis94c/ci-jwt", "%base64");
   }
   /**
@@ -76,7 +78,9 @@ 
    * @param  string|int $value Value of the item.
    */
   public function header(string $key, $value=null) {
-    if ($value === null) return $this->header[$key];
+    if ($value === null) {
+     return $this->header[$key];
+    }
     $this->header[$key] = $value;
   }
   /**
@@ -93,7 +97,9 @@ 
    * @return string|int|null Value of $key if $value == null, else returns null.
    */
   public function payload(string $key, $value=null) {
-    if ($value === null) return $this->payload[$key];
+    if ($value === null) {
+     return $this->payload[$key];
+    }
     $this->payload[$key] = $value;
   }
   /**
@@ -118,21 +124,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 . ".";
   }
   /**
@@ -141,11 +159,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)) . ".";
   }
   /**
@@ -155,14 +179,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 = $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;
     }
@@ -186,9 +217,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;
@@ -230,7 +265,9 @@ 
    * @return string        Complete JWT.
    */
   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;