smarcet / JOSE4PHP

src/jwt/impl/JWT.php

Spacing +4 added lines, -5 removed lines

@@ -91,9 +91,8 @@ 
      */
     public function take()
     {
-        $payload = ($this->header->getType()->getString() === 'JWT') ?  $this->claim_set : '';
-        return array
-        (
+        $payload = ($this->header->getType()->getString() === 'JWT') ? $this->claim_set : '';
+        return array(
             $this->header,
             $payload,
             $this->signature
@@ -108,9 +107,9 @@ 
     {
         $now = new \DateTime();
         $exp = $this->getClaimSet()->getExpirationTime()->getDateTime();
-        if($exp < $now) return true;
+        if ($exp < $now) return true;
         $iat = $this->getClaimSet()->getIssuedAt()->getDateTime();
-        if($iat > $now) return true;
+        if ($iat > $now) return true;
         $diff = $now->getTimestamp() - $iat->getTimestamp();
         return $diff > $tolerance;
     }

Braces +6 added lines, -2 removed lines

@@ -108,9 +108,13 @@
     {
         $now = new \DateTime();
         $exp = $this->getClaimSet()->getExpirationTime()->getDateTime();
-        if($exp < $now) return true;
+        if($exp < $now) {
+         return true;
+        }
         $iat = $this->getClaimSet()->getIssuedAt()->getDateTime();
-        if($iat > $now) return true;
+        if($iat > $now) {
+         return true;
+        }
         $diff = $now->getTimestamp() - $iat->getTimestamp();
         return $diff > $tolerance;
     }

src/jwt/impl/JWTSerializer.php

Braces +3 added lines, -2 removed lines

@@ -50,8 +50,9 @@
 
         $e_parts = explode(IBasicJWT::SegmentSeparator, $input);
 
-        if(count($e_parts) < 2)
-            throw new InvalidJWTException(sprintf('%s has only 2 or less encoded parts!'));
+        if(count($e_parts) < 2) {
+                    throw new InvalidJWTException(sprintf('%s has only 2 or less encoded parts!'));
+        }
         $e_header    = $e_parts[0];
         $e_payload   = $e_parts[1];
         $e_signature = count($e_parts)>2 ? $e_parts[2] : '';

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
      * @param IJWTSnapshot $jwt_snapshot
      * @return string
      */
-    static public function serialize(IJWTSnapshot $jwt_snapshot){
+    static public function serialize(IJWTSnapshot $jwt_snapshot) {
         list($header, $payload, $signature) = $jwt_snapshot->take();
 
         $e_header    = JOSEHeaderSerializer::serialize($header);
@@ -46,18 +46,18 @@ 
      * @return array
      * @throws InvalidJWTException
      */
-    static public function deserialize($input){
+    static public function deserialize($input) {
 
         $e_parts = explode(IBasicJWT::SegmentSeparator, $input);
 
-        if(count($e_parts) < 2)
+        if (count($e_parts) < 2)
             throw new InvalidJWTException(sprintf('%s has only 2 or less encoded parts!'));
         $e_header    = $e_parts[0];
         $e_payload   = $e_parts[1];
-        $e_signature = count($e_parts)>2 ? $e_parts[2] : '';
+        $e_signature = count($e_parts) > 2 ? $e_parts[2] : '';
         $header    = JOSEHeaderSerializer::deserialize($e_header);
         $payload   = ($header->getType()->getString() === 'JWT') ? JWTClaimSetSerializer::deserialize($e_payload) : JWTRawSerializer::deserialize($e_payload);
-        $signature = !empty($e_signature) ? JWTRawSerializer::deserialize($e_signature): '';
+        $signature = !empty($e_signature) ? JWTRawSerializer::deserialize($e_signature) : '';
         return array($header, $payload, $signature);
     }
 }
\ No newline at end of file

src/jwt/impl/JWTClaimSet.php

Spacing +3 added lines, -5 removed lines

@@ -40,8 +40,7 @@ 
      * @param JsonValue $id
      * @param NumericDate $nbf
      */
-    public function __construct
-    (
+    public function __construct(
         StringOrURI $issuer          = null,
         StringOrURI $subject         = null,
         StringOrURI $audience        = null,
@@ -135,7 +134,7 @@ 
     public function getClaims()
     {
        $claims = array();
-       foreach($this->set as $k => $v)
+       foreach ($this->set as $k => $v)
        {
            array_push($claims, new JWTClaim($k, $v));
        }
@@ -260,7 +259,6 @@ 
     public function getClaimByName($claim_name)
     {
        return isset($this->set[$claim_name]) ?
-           $this->set[$claim_name] :
-           null;
+           $this->set[$claim_name] : null;
     }
 }
\ No newline at end of file

Braces +3 added lines, -2 removed lines

@@ -123,8 +123,9 @@
      */
     public function addClaim(JWTClaim $claim)
     {
-        if (isset($this->set[$claim->getName()]))
-            throw new ClaimAlreadyExistsException($claim->getName());
+        if (isset($this->set[$claim->getName()])) {
+                    throw new ClaimAlreadyExistsException($claim->getName());
+        }
 
         $this->set[$claim->getName()] = $claim->getValue();
     }

src/jwt/impl/JOSEHeader.php

Spacing +2 added lines, -3 removed lines

@@ -33,8 +33,7 @@ 
      * @param JsonValue|null $kid
      * @param StringOrURI|null $cty
      */
-    public function __construct
-    (
+    public function __construct(
         StringOrURI $alg,
         StringOrURI $type = null,
         JsonValue   $kid  = null,
@@ -96,7 +95,7 @@ 
     public function getHeaderByName($name)
     {
         $value = $this[$name];
-        if(is_null($value)) return null;
+        if (is_null($value)) return null;
         return new JOSEHeaderParam($name, $value);
     }
 }
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -96,7 +96,9 @@
     public function getHeaderByName($name)
     {
         $value = $this[$name];
-        if(is_null($value)) return null;
+        if(is_null($value)) {
+         return null;
+        }
         return new JOSEHeaderParam($name, $value);
     }
 }
\ No newline at end of file

src/jwt/impl/UnsecuredJWT.php

Spacing +3 added lines, -5 removed lines

@@ -37,10 +37,8 @@ 
     protected function __construct(IJWTClaimSet $claim_set)
     {
 
-        parent::__construct
-        (
-            new JOSEHeader
-            (
+        parent::__construct(
+            new JOSEHeader(
                 new StringOrURI('none'),
                 new StringOrURI('JWT')
             ),
@@ -75,7 +73,7 @@ 
     {
         list($header, $payload, $signature) = JWTSerializer::deserialize($compact_serialization);
 
-        if(!($payload instanceof IJWTClaimSet))
+        if (!($payload instanceof IJWTClaimSet))
             throw new \RuntimeException('Invalid payload type!');
 
         $jwt = new UnsecuredJWT($payload);

Braces +3 added lines, -2 removed lines

@@ -75,8 +75,9 @@
     {
         list($header, $payload, $signature) = JWTSerializer::deserialize($compact_serialization);
 
-        if(!($payload instanceof IJWTClaimSet))
-            throw new \RuntimeException('Invalid payload type!');
+        if(!($payload instanceof IJWTClaimSet)) {
+                    throw new \RuntimeException('Invalid payload type!');
+        }
 
         $jwt = new UnsecuredJWT($payload);
         $jwt->header = $header;

src/jwt/utils/JWTRawSerializer.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
      * @param string $raw_input
      * @return string
      */
-    public static function serialize($raw_input){
+    public static function serialize($raw_input) {
         $base64 = new Base64UrlRepresentation();
         return $base64->encode($raw_input);
     }
@@ -30,7 +30,7 @@ 
      * @param string $input
      * @return string
      */
-    public static function deserialize($input){
+    public static function deserialize($input) {
         $base64 = new Base64UrlRepresentation();
         return $base64->decode($input);
     }

src/jwt/utils/JWTClaimSetFactory.php

Spacing +4 added lines, -4 removed lines

@@ -32,14 +32,14 @@ 
      * @param array $raw_claims
      * @return IJWTClaimSet
      */
-    public static function build(array $raw_claims){
+    public static function build(array $raw_claims) {
 
         $args = array();
 
-        foreach(RegisteredJWTClaimNames::$registered_claim_set as $claim_name){
+        foreach (RegisteredJWTClaimNames::$registered_claim_set as $claim_name) {
             $value = isset($raw_claims[$claim_name]) ? $raw_claims[$claim_name] : null;
             $type  = RegisteredJWTClaimNames::$registered_claim_set_types[$claim_name];
-            if(!is_null($value))
+            if (!is_null($value))
             {
                 $class    = new ReflectionClass($type);
                 $value    = $class->newInstanceArgs(array($value));
@@ -54,7 +54,7 @@ 
 
         // unregistered claims
 
-        foreach($raw_claims as $k => $v){
+        foreach ($raw_claims as $k => $v) {
             $claim_set->addClaim(new JWTClaim($k, new JsonValue($v)));
         }
 

src/jwt/utils/JOSEHeaderFactory.php

Braces +3 added lines, -1 removed lines

@@ -43,7 +43,9 @@
             $type  = @RegisteredJOSEHeaderNames::$registered_basic_headers_set_types[$header_name];
             if(!is_null($value))
             {
-                if(is_null($type)) continue;
+                if(is_null($type)) {
+                 continue;
+                }
                 $class    = new \ReflectionClass($type);
                 $value    = $class->newInstanceArgs(array($value));
             }

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
  */
 class JOSEHeaderFactory {
 
-    static protected function getProductClass(){
+    static protected function getProductClass() {
         return  '\jwt\impl\JOSEHeader';
     }
 
@@ -35,12 +35,12 @@ 
 
         $args = [];
 
-        foreach(RegisteredJOSEHeaderNames::$registered_basic_headers_set as $header_name){
+        foreach (RegisteredJOSEHeaderNames::$registered_basic_headers_set as $header_name) {
             $value = isset($raw_headers[$header_name]) ? $raw_headers[$header_name] : null;
             $type  = @RegisteredJOSEHeaderNames::$registered_basic_headers_set_types[$header_name];
-            if(!is_null($value))
+            if (!is_null($value))
             {
-                if(is_null($type)) continue;
+                if (is_null($type)) continue;
                 $class    = new \ReflectionClass($type);
                 $value    = $class->newInstanceArgs(array($value));
             }
@@ -54,7 +54,7 @@ 
 
         // unregistered headers
 
-        foreach($raw_headers as $k => $v){
+        foreach ($raw_headers as $k => $v) {
             $basic_header->addHeader(new JOSEHeaderParam($k, new JsonValue($v)));
         }
 

src/jwt/utils/JWTClaimSetSerializer.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
      * @param IJWTClaimSet $claim_set
      * @return string
      */
-    public static function serialize(IJWTClaimSet $claim_set){
+    public static function serialize(IJWTClaimSet $claim_set) {
         $json = $claim_set->toJson();
         return JWTRawSerializer::serialize($json);
     }
@@ -35,7 +35,7 @@ 
      * @param $input
      * @return IJWTClaimSet
      */
-    public static function deserialize($input){
+    public static function deserialize($input) {
         $json        = JWTRawSerializer::deserialize($input);
         $raw_claims  = json_decode($json, true);