smarcet / JOSE4PHP

src/utils/json_types/JsonObject.php

Braces +6 added lines, -4 removed lines

@@ -95,8 +95,9 @@ 
        foreach($this->set as $key => $val){
            if($val instanceof JsonValue){
                $res[$key] = $val->getValue();
-               if($res[$key] instanceof JsonObject)
-                   $res[$key] = $res[$key]->toArray();
+               if($res[$key] instanceof JsonObject) {
+                                  $res[$key] = $res[$key]->toArray();
+               }
                if(is_array($res[$key])){
                    $res[$key] = $this->processArray($res[$key]);
                }
@@ -109,8 +110,9 @@ 
     private function processArray($original){
         $temp = array();
         foreach($original as $k => $val){
-            if($val instanceof JsonObject)
-                $val = $val->toArray();
+            if($val instanceof JsonObject) {
+                            $val = $val->toArray();
+            }
             $temp[$k] = $val;
         }
         return $temp;

src/jwe/impl/JWEJOSEHeaderFactory.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));
             }

src/jwe/impl/JWEJOSEHeader.php

Braces +3 added lines, -2 removed lines

@@ -50,8 +50,9 @@
 
         $this->set[RegisteredJWEJOSEHeaderNames::EncryptionAlgorithm] = $enc;
 
-        if(!is_null($zip) && CompressionAlgorithms_Registry::getInstance()->get($zip->getValue()))
-            $this->set[RegisteredJWEJOSEHeaderNames::CompressionAlgorithm] = $zip;
+        if(!is_null($zip) && CompressionAlgorithms_Registry::getInstance()->get($zip->getValue())) {
+                    $this->set[RegisteredJWEJOSEHeaderNames::CompressionAlgorithm] = $zip;
+        }
     }
 
     /**

src/jwe/impl/specs/JWE_ParamsSpecification.php

Braces +6 added lines, -4 removed lines

@@ -66,11 +66,13 @@
     public function __construct(IJWK $key, StringOrURI $alg, StringOrURI $enc, $payload,  JsonValue $zip = null)
     {
 
-        if(is_null($key))
-            throw new JWEInvalidRecipientKeyException();
+        if(is_null($key)) {
+                    throw new JWEInvalidRecipientKeyException();
+        }
 
-        if(is_null($payload))
-            throw new JWEInvalidPayloadException('missing payload');
+        if(is_null($payload)) {
+                    throw new JWEInvalidPayloadException('missing payload');
+        }
 
         $this->key     = $key;
         $this->alg     = $alg;

src/jwe/JWEFactory.php

Braces +9 added lines, -6 removed lines

@@ -40,8 +40,8 @@ 
         if($spec instanceof IJWE_ParamsSpecification)
         {
 
-            if($spec->getRecipientKey()->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Encryption)
-                throw new InvalidJWKType
+            if($spec->getRecipientKey()->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Encryption) {
+                            throw new InvalidJWKType
                 (
                     sprintf
                     (
@@ -49,9 +49,10 @@ 
                         $spec->getRecipientKey()->getKeyUse()->getString()
                     )
                 );
+            }
 
-            if($spec->getAlg()->getString() !== $spec->getRecipientKey()->getAlgorithm()->getString())
-                throw new InvalidJWKAlgorithm
+            if($spec->getAlg()->getString() !== $spec->getRecipientKey()->getAlgorithm()->getString()) {
+                            throw new InvalidJWKAlgorithm
                 (
                     sprintf
                     (
@@ -60,6 +61,7 @@ 
                         $spec->getRecipientKey()->getAlgorithm()->getString()
                     )
                 );
+            }
 
             $header = new JWEJOSEHeader
             (
@@ -71,8 +73,9 @@ 
             //set zip alg
             $zip    = $spec->getZip();
 
-            if(!is_null($zip))
-                $header->setCompressionAlgorithm($zip);
+            if(!is_null($zip)) {
+                            $header->setCompressionAlgorithm($zip);
+            }
 
             $jwe = JWE::fromHeaderAndPayload($header, $spec->getPayload());
 

src/jwe/compression_algorithms/CompressionAlgorithms_Registry.php

Braces +3 added lines, -1 removed lines

@@ -64,7 +64,9 @@
      * @return null|CompressionAlgorithm
      */
     public function get($alg){
-        if(!$this->isSupported($alg)) return null;
+        if(!$this->isSupported($alg)) {
+         return null;
+        }
         return $this->algorithms[$alg];
     }
 }
\ No newline at end of file

src/jwk/impl/OctetSequenceJWK.php

Braces +6 added lines, -3 removed lines

@@ -40,14 +40,17 @@
     protected function __construct(Key $secret, $headers = array())
     {
 
-        if(empty($secret))
-            throw new InvalidOctetSequenceJWKException('secret is not set!.');
+        if(empty($secret)) {
+                    throw new InvalidOctetSequenceJWKException('secret is not set!.');
+        }
 
         $this->set[JSONWebKeyParameters::KeyType] = new StringOrURI(JSONWebKeyTypes::OctetSequence);
 
         parent::__construct($headers);
 
-        if(count($headers) === 0 ) return;
+        if(count($headers) === 0 ) {
+         return;
+        }
 
         $b64 = new Base64UrlRepresentation();
 

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];