smarcet / JOSE4PHP

src/jwk/impl/OctetSequenceJWKFactory.php

Braces +18 added lines, -10 removed lines

@@ -41,37 +41,42 @@ 
     static public function build(IJWKSpecification $spec)
     {
 
-        if(is_null($spec)) throw new \InvalidArgumentException('missing spec param');
+        if(is_null($spec)) {
+         throw new \InvalidArgumentException('missing spec param');
+        }
 
         $algorithm = DigitalSignatures_MACs_Registry::getInstance()->get
         (
             $spec->getAlg()
         );
 
-        if(is_null($algorithm))
-            $algorithm = ContentEncryptionAlgorithms_Registry::getInstance()->get
+        if(is_null($algorithm)) {
+                    $algorithm = ContentEncryptionAlgorithms_Registry::getInstance()->get
             (
                 $spec->getAlg()
             );
+        }
 
-        if(is_null($algorithm))
-            $algorithm = KeyManagementAlgorithms_Registry::getInstance()->get
+        if(is_null($algorithm)) {
+                    $algorithm = KeyManagementAlgorithms_Registry::getInstance()->get
             (
                 $spec->getAlg()
             );
+        }
 
-        if(is_null($algorithm))
-            throw new InvalidJWKAlgorithm
+        if(is_null($algorithm)) {
+                    throw new InvalidJWKAlgorithm
             (
                 sprintf(
                     'alg %s not supported!',
                     $spec->getAlg()
                 )
             );
+        }
 
 
-        if($algorithm->getKeyType() !== JSONWebKeyTypes::OctetSequence)
-            throw new InvalidJWKAlgorithm
+        if($algorithm->getKeyType() !== JSONWebKeyTypes::OctetSequence) {
+                    throw new InvalidJWKAlgorithm
             (
                 sprintf
                 (
@@ -79,8 +84,11 @@ 
                     $algorithm->getKeyType()
                 )
             );
+        }
 
-        if(!($spec instanceof OctetSequenceJWKSpecification)) throw new JWKInvalidSpecException;
+        if(!($spec instanceof OctetSequenceJWKSpecification)) {
+         throw new JWKInvalidSpecException;
+        }
 
         $shared_secret = $spec->getSharedSecret();
         $secret_len    = strlen($shared_secret);

src/jwk/impl/JWKSet.php

Braces +30 added lines, -14 removed lines

@@ -56,8 +56,9 @@ 
      */
     public function getKeys()
     {
-        if(isset($this->set[JWKSetParameters::Keys]))
-            return $this->set[JWKSetParameters::Keys]->getValue();
+        if(isset($this->set[JWKSetParameters::Keys])) {
+                    return $this->set[JWKSetParameters::Keys]->getValue();
+        }
         return array();
     }
 
@@ -70,14 +71,17 @@ 
     {
         $id = $key->getId();
 
-        if(empty($id))
-            throw new JWKInvalidIdentifierException('key id is empty!');
+        if(empty($id)) {
+                    throw new JWKInvalidIdentifierException('key id is empty!');
+        }
 
-        if(array_key_exists($id->getValue(), $this->keys_ids))
-            throw new JWKInvalidIdentifierException(sprintf('id %s already exists!'), $key->getId()->getValue());
+        if(array_key_exists($id->getValue(), $this->keys_ids)) {
+                    throw new JWKInvalidIdentifierException(sprintf('id %s already exists!'), $key->getId()->getValue());
+        }
 
-        if(!isset($this->set[JWKSetParameters::Keys]))
-            $this->set[JWKSetParameters::Keys] = new JsonArray(array());
+        if(!isset($this->set[JWKSetParameters::Keys])) {
+                    $this->set[JWKSetParameters::Keys] = new JsonArray(array());
+        }
 
         $keys = $this->set[JWKSetParameters::Keys];
         $keys->append($key);
@@ -91,7 +95,9 @@ 
      */
     public function getKeyById($kid)
     {
-        if(!array_key_exists($kid, $this->keys_ids)) return null;
+        if(!array_key_exists($kid, $this->keys_ids)) {
+         return null;
+        }
         return $this->keys_ids[$kid];
     }
 
@@ -104,7 +110,9 @@ 
     static public function fromJson($json){
         $json = str_replace( array("\n","\r","\t"), '', trim($json));
         $res  = json_decode($json, true);
-        if(!isset($res[JWKSetParameters::Keys])) throw new JWKInvalidIdentifierException;
+        if(!isset($res[JWKSetParameters::Keys])) {
+         throw new JWKInvalidIdentifierException;
+        }
         $keys = $res[JWKSetParameters::Keys];
         $jwk_set = new JWKSet;
         foreach($keys as $key){
@@ -112,16 +120,24 @@ 
             $kid = @$key[JSONWebKeyParameters::KeyId];
             $use = @$key[JSONWebKeyParameters::PublicKeyUse];
             $alg = @$key[JSONWebKeyParameters::Algorithm];
-            if(empty($alg)) $alg = JSONWebSignatureAndEncryptionAlgorithms::RS256;
+            if(empty($alg)) {
+             $alg = JSONWebSignatureAndEncryptionAlgorithms::RS256;
+            }
 
-            if(empty($kty) || empty($kid) || empty($use)) continue;
+            if(empty($kty) || empty($kid) || empty($use)) {
+             continue;
+            }
 
-            if(!in_array($kty, JSONWebKeyTypes::$supported_keys)) continue;
+            if(!in_array($kty, JSONWebKeyTypes::$supported_keys)) {
+             continue;
+            }
 
             $n        = @$key[RSAKeysParameters::Modulus];
             $e        = @$key[RSAKeysParameters::Exponent];
             $x5c      = @$key[PublicJSONWebKeyParameters::X_509CertificateChain];
-            if(is_null($x5c)) $x5c = array();
+            if(is_null($x5c)) {
+             $x5c = array();
+            }
             $x5u      = @$key[PublicJSONWebKeyParameters::X_509Url];
             $x5t      = @$key[PublicJSONWebKeyParameters::X_509CertificateSHA_1_Thumbprint];
             $x5t_S256 = @$key[PublicJSONWebKeyParameters::X_509CertificateSHA_256_Thumbprint];

src/jwk/impl/RSAJWKFactory.php

Braces +9 added lines, -5 removed lines

@@ -41,7 +41,9 @@ 
     static public function build(IJWKSpecification $spec)
     {
 
-        if(is_null($spec)) throw new \InvalidArgumentException('missing spec param');
+        if(is_null($spec)) {
+         throw new \InvalidArgumentException('missing spec param');
+        }
 
         $algorithm = DigitalSignatures_MACs_Registry::getInstance()->get($spec->getAlg());
 
@@ -50,8 +52,8 @@ 
             $algorithm = KeyManagementAlgorithms_Registry::getInstance()->get($spec->getAlg());
         }
 
-        if(is_null($algorithm))
-            throw new InvalidJWKAlgorithm
+        if(is_null($algorithm)) {
+                    throw new InvalidJWKAlgorithm
             (
                 sprintf
                 (
@@ -59,9 +61,10 @@ 
                     $spec->getAlg()
                 )
             );
+        }
 
-        if($algorithm->getKeyType() !== JSONWebKeyTypes::RSA)
-            throw new InvalidJWKAlgorithm
+        if($algorithm->getKeyType() !== JSONWebKeyTypes::RSA) {
+                    throw new InvalidJWKAlgorithm
             (
                 sprintf
                 (
@@ -69,6 +72,7 @@ 
                     $algorithm->getKeyType()
                 )
             );
+        }
 
         if ($spec instanceof RSAJWKPEMPrivateKeySpecification)
         {

src/jwk/impl/RSAJWKSpecification.php

Braces +3 added lines, -2 removed lines

@@ -39,8 +39,9 @@
         $kid = null
     )
     {
-        if(!empty($alg) && !in_array($alg, RSAKeysParameters::$valid_algorithms_values))
-            throw new InvalidJWKAlgorithm(sprintf('alg %s', $alg));
+        if(!empty($alg) && !in_array($alg, RSAKeysParameters::$valid_algorithms_values)) {
+                    throw new InvalidJWKAlgorithm(sprintf('alg %s', $alg));
+        }
 
         parent::__construct($alg, $use, $kid);
     }

src/jwk/impl/OctetSequenceJWKSpecification.php

Braces +3 added lines, -2 removed lines

@@ -45,8 +45,9 @@
         $use = JSONWebKeyPublicKeyUseValues::Signature
     )
     {
-        if(!in_array($alg, OctetSequenceKeysParameters::$valid_algorithms_values))
-            throw new InvalidJWKAlgorithm(sprintf('alg %s', $alg));
+        if(!in_array($alg, OctetSequenceKeysParameters::$valid_algorithms_values)) {
+                    throw new InvalidJWKAlgorithm(sprintf('alg %s', $alg));
+        }
 
         parent::__construct($alg, $use);
 

src/jwk/impl/RSAJWK.php

Braces +21 added lines, -11 removed lines

@@ -53,11 +53,14 @@ 
 
         parent::__construct($headers);
 
-        if (count($headers) === 0) return;
+        if (count($headers) === 0) {
+         return;
+        }
 
         foreach (RSAKeysParameters::$public_key_params as $p) {
-            if (!array_key_exists($p, $headers))
-                throw new RSAJWKMissingPublicKeyParamException();
+            if (!array_key_exists($p, $headers)) {
+                            throw new RSAJWKMissingPublicKeyParamException();
+            }
             $this->set[$p] = new Base64urlUInt($headers[$p]);
         }
 
@@ -74,8 +77,9 @@ 
             //its has one private param, must have all ...
             if (in_array(RSAKeysParameters::FirstPrimeFactor, $headers)) {
                 foreach (RSAKeysParameters::$producers_private_key_params as $p) {
-                    if (!array_key_exists($p, $headers))
-                        throw new RSAJWKMissingPrivateKeyParamException();
+                    if (!array_key_exists($p, $headers)) {
+                                            throw new RSAJWKMissingPrivateKeyParamException();
+                    }
                     $this->set[$p] = new Base64urlUInt($headers[$p]);
                 }
                 $this->private_key = RSAFacade::getInstance()->buildPrivateKey(
@@ -112,11 +116,13 @@ 
      */
     static public function fromKeys(KeyPair $keys)
     {
-        if(!($keys->getPrivate() instanceof RSAPrivateKey))
-            throw new \RuntimeException('Private key of invalid type!');
+        if(!($keys->getPrivate() instanceof RSAPrivateKey)) {
+                    throw new \RuntimeException('Private key of invalid type!');
+        }
 
-        if(!($keys->getPublic() instanceof RSAPublicKey))
-            throw new \RuntimeException('Public key of invalid type!');
+        if(!($keys->getPublic() instanceof RSAPublicKey)) {
+                    throw new \RuntimeException('Public key of invalid type!');
+        }
 
         $jwk                                          = new RSAJWK();
         $jwk->public_key                              = $keys->getPublic();
@@ -134,7 +140,9 @@ 
      */
     static public function fromPublicKey(PublicKey $public_key)
     {
-        if (!($public_key instanceof RSAPublicKey)) throw new InvalidJWKType();
+        if (!($public_key instanceof RSAPublicKey)) {
+         throw new InvalidJWKType();
+        }
         $jwk = new RSAJWK();
         $jwk->public_key = $public_key;
         $jwk->set[RSAKeysParameters::Exponent] = Base64urlUInt::fromBigInt($public_key->getPublicExponent());
@@ -149,7 +157,9 @@ 
      */
     static public function fromPrivateKey(PrivateKey $private_key)
     {
-        if (!($private_key instanceof RSAPrivateKey)) throw new InvalidJWKType();
+        if (!($private_key instanceof RSAPrivateKey)) {
+         throw new InvalidJWKType();
+        }
         $jwk = new RSAJWK();
         $jwk->private_key = $private_key;
         $jwk->set[RSAKeysParameters::Exponent] = Base64urlUInt::fromBigInt($private_key->getPublicExponent());

src/jwk/impl/AsymmetricJWK.php

Braces +6 added lines, -3 removed lines

@@ -63,7 +63,9 @@ 
     {
         parent::__construct($headers);
 
-        if(count($headers) === 0 ) return;
+        if(count($headers) === 0 ) {
+         return;
+        }
 
         // certificates
         if(in_array(PublicJSONWebKeyParameters::X_509CertificateChain, $headers) && is_array($headers[PublicJSONWebKeyParameters::X_509CertificateChain])){
@@ -109,8 +111,9 @@ 
      */
     public function setVisibility($visibility)
     {
-        if(!in_array($visibility, JSONWebKeyVisibility::$valid_values))
-            throw new InvalidJWKVisibilityException;
+        if(!in_array($visibility, JSONWebKeyVisibility::$valid_values)) {
+                    throw new InvalidJWKVisibilityException;
+        }
         $this->visibility = $visibility;
         return $this;
     }

src/jwk/impl/JWK.php

Braces +18 added lines, -10 removed lines

@@ -42,7 +42,9 @@ 
      */
     protected function __construct(array $headers = array()){
 
-        if(count($headers) === 0 ) return;
+        if(count($headers) === 0 ) {
+         return;
+        }
 
         $alg = @$headers[JSONWebKeyParameters::Algorithm];
         $this->setAlgorithm($alg);
@@ -84,8 +86,9 @@ 
      */
     public function setId($kid)
     {
-        if(!empty($kid))
-            $this->set[JSONWebKeyParameters::KeyId] = new  JsonValue($kid);
+        if(!empty($kid)) {
+                    $this->set[JSONWebKeyParameters::KeyId] = new  JsonValue($kid);
+        }
         return $this;
     }
 
@@ -96,8 +99,9 @@ 
      */
     public function setAlgorithm($alg)
     {
-        if(!in_array($alg, JSONWebSignatureAndEncryptionAlgorithms::$header_location_alg))
-            throw new InvalidJWKAlgorithm (sprintf('alg %s', $alg));
+        if(!in_array($alg, JSONWebSignatureAndEncryptionAlgorithms::$header_location_alg)) {
+                    throw new InvalidJWKAlgorithm (sprintf('alg %s', $alg));
+        }
 
         $this->set[JSONWebKeyParameters::Algorithm] = new StringOrURI($alg);
         return $this;
@@ -110,9 +114,12 @@ 
      */
     public function setKeyUse($use)
     {
-        if(empty($use)) return $this;
-        if(!in_array($use, JSONWebKeyPublicKeyUseValues::$valid_uses))
-            throw new InvalidJWKUseException(sprintf('use %s', $use));
+        if(empty($use)) {
+         return $this;
+        }
+        if(!in_array($use, JSONWebKeyPublicKeyUseValues::$valid_uses)) {
+                    throw new InvalidJWKUseException(sprintf('use %s', $use));
+        }
 
         $this->set[JSONWebKeyParameters::PublicKeyUse] = new StringOrURI($use);
         return $this;
@@ -125,8 +132,9 @@ 
      */
     public function setType($type)
     {
-        if(!in_array($type, JSONWebKeyTypes::$valid_keys_set))
-            throw new InvalidJWKType(sprintf('use %s', $type));
+        if(!in_array($type, JSONWebKeyTypes::$valid_keys_set)) {
+                    throw new InvalidJWKType(sprintf('use %s', $type));
+        }
 
         $this->set[JSONWebKeyParameters::KeyType] = new StringOrURI($type);
         return $this;

src/jwt/utils/JOSEHeaderFactory.php

Braces +3 added lines, -1 removed lines

@@ -40,7 +40,9 @@
             $type  = @RegisteredJWEJOSEHeaderNames::$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));
             }