smarcet / JOSE4PHP

src/jwa/cryptographic_algorithms/KeyManagementAlgorithms_Registry.php

Spacing +3 added lines, -3 removed lines

@@ -43,14 +43,14 @@ 
         $this->algorithms[JSONWebSignatureAndEncryptionAlgorithms::Dir] = new DirAlgorithm;
     }
 
-    private function __clone(){}
+    private function __clone() {}
 
     /**
      * @return KeyManagementAlgorithms_Registry
      */
     public static function getInstance()
     {
-        if(!is_object(self::$instance))
+        if (!is_object(self::$instance))
         {
             self::$instance = new KeyManagementAlgorithms_Registry();
         }
@@ -72,7 +72,7 @@ 
      */
     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

Braces +3 added lines, -1 removed lines

@@ -72,7 +72,9 @@
      */
     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/jwa/cryptographic_algorithms/DigitalSignatures_MACs_Registry.php

Braces +3 added lines, -1 removed lines

@@ -81,7 +81,9 @@
      * @return null|DigitalSignatureAlgorithm|MAC_Algorithm
      */
     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

Spacing +7 added lines, -7 removed lines

@@ -36,7 +36,7 @@ 
 
     private $algorithms = [];
 
-    private function __construct(){
+    private function __construct() {
 
         $this->algorithms[JSONWebSignatureAndEncryptionAlgorithms::HS256] = new HS256_Algorithm;
         $this->algorithms[JSONWebSignatureAndEncryptionAlgorithms::HS384] = new HS384_Algorithm;
@@ -52,13 +52,13 @@ 
 
     }
 
-    private function __clone(){}
+    private function __clone() {}
 
     /**
      * @return DigitalSignatures_MACs_Registry
      */
-    public static function getInstance(){
-        if(!is_object(self::$instance)){
+    public static function getInstance() {
+        if (!is_object(self::$instance)) {
             self::$instance = new DigitalSignatures_MACs_Registry();
         }
         return self::$instance;
@@ -68,7 +68,7 @@ 
      * @param string $alg
      * @return bool
      */
-    public function isSupported($alg){
+    public function isSupported($alg) {
         return array_key_exists($alg, $this->algorithms);
     }
 
@@ -76,8 +76,8 @@ 
      * @param $alg
      * @return null|DigitalSignatureAlgorithm|MAC_Algorithm
      */
-    public function get($alg){
-        if(!$this->isSupported($alg)) return null;
+    public function get($alg) {
+        if (!$this->isSupported($alg)) return null;
         return $this->algorithms[$alg];
     }
 }
\ No newline at end of file

src/jwa/cryptographic_algorithms/macs/HSMAC_Algorithm.php

Spacing +5 added lines, -5 removed lines

@@ -35,10 +35,10 @@ 
      * @return string
      * @throws InvalidKeyLengthAlgorithmException
      */
-    public function digest(SharedKey $key, $message){
+    public function digest(SharedKey $key, $message) {
 
-        if($this->getMinKeyLen() > $key->getBitLength())
-            throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $key->getBitLength()));
+        if ($this->getMinKeyLen() > $key->getBitLength())
+            throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.', $this->getMinKeyLen(), $key->getBitLength()));
 
         return hash_hmac($this->getHashingAlgorithm(), $message, $key->getSecret(), true);
     }
@@ -51,8 +51,8 @@ 
      * @throws InvalidKeyLengthAlgorithmException
      * @throws InvalidKeyTypeAlgorithmException
      */
-    public function verify(Key $key, $message, $digest){
-        if(!($key instanceof SharedKey)) throw new InvalidKeyTypeAlgorithmException;
+    public function verify(Key $key, $message, $digest) {
+        if (!($key instanceof SharedKey)) throw new InvalidKeyTypeAlgorithmException;
 
         return $digest === $this->digest($key, $message);
     }

Braces +6 added lines, -3 removed lines

@@ -37,8 +37,9 @@ 
      */
     public function digest(SharedKey $key, $message){
 
-        if($this->getMinKeyLen() > $key->getBitLength())
-            throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $key->getBitLength()));
+        if($this->getMinKeyLen() > $key->getBitLength()) {
+                    throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $key->getBitLength()));
+        }
 
         return hash_hmac($this->getHashingAlgorithm(), $message, $key->getSecret(), true);
     }
@@ -52,7 +53,9 @@ 
      * @throws InvalidKeyTypeAlgorithmException
      */
     public function verify(Key $key, $message, $digest){
-        if(!($key instanceof SharedKey)) throw new InvalidKeyTypeAlgorithmException;
+        if(!($key instanceof SharedKey)) {
+         throw new InvalidKeyTypeAlgorithmException;
+        }
 
         return $digest === $this->digest($key, $message);
     }

src/jwa/cryptographic_algorithms/ContentEncryptionAlgorithms_Registry.php

Braces +3 added lines, -1 removed lines

@@ -68,7 +68,9 @@
      * @return null|ContentEncryptionAlgorithm
      */
     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/jwa/cryptographic_algorithms/key_management/rsa/RSA_KeyManagementAlgorithm.php

Spacing +10 added lines, -10 removed lines

@@ -30,7 +30,7 @@ 
     extends Abstract_RSA_Algorithm
     implements EncryptionAlgorithm, KeyEncryption {
 
-    public function __construct(){
+    public function __construct() {
 
         parent::__construct();
         //configuration ...
@@ -47,18 +47,18 @@ 
      */
     public function encrypt(Key $key, $message)
     {
-        if(!($key instanceof RSAPublicKey))
+        if (!($key instanceof RSAPublicKey))
             throw new InvalidKeyTypeAlgorithmException('key is not public');
 
-        if($key->getFormat() !== 'PKCS8')
+        if ($key->getFormat() !== 'PKCS8')
             throw new InvalidKeyTypeAlgorithmException('keys is not on PKCS1 format');
 
         $res = $this->rsa_impl->loadKey($key->getEncoded());
 
-        if(!$res)
+        if (!$res)
             throw new InvalidKeyTypeAlgorithmException('could not parse the key');
 
-        if($this->rsa_impl->getSize() < $this->getMinKeyLen())
+        if ($this->rsa_impl->getSize() < $this->getMinKeyLen())
             throw new InvalidKeyTypeAlgorithmException('len is invalid');
 
         return $this->rsa_impl->encrypt($message);
@@ -70,21 +70,21 @@ 
      * @return string
      * @throws InvalidKeyTypeAlgorithmException
      */
-    public function decrypt(Key $key, $enc_message){
+    public function decrypt(Key $key, $enc_message) {
 
-        if(!($key instanceof RSAPrivateKey))
+        if (!($key instanceof RSAPrivateKey))
             throw new InvalidKeyTypeAlgorithmException('key is not private');
 
 
-        if($key->getFormat() !== 'PKCS1')
+        if ($key->getFormat() !== 'PKCS1')
             throw new InvalidKeyTypeAlgorithmException('keys is not on PKCS1 format');
 
         $res = $this->rsa_impl->loadKey($key->getEncoded());
 
-        if(!$res)
+        if (!$res)
             throw new InvalidKeyTypeAlgorithmException('could not parse the key');
 
-        if($this->rsa_impl->getSize() < $this->getMinKeyLen())
+        if ($this->rsa_impl->getSize() < $this->getMinKeyLen())
             throw new InvalidKeyTypeAlgorithmException('len is invalid');
 
         return $this->rsa_impl->decrypt($enc_message);

Braces +24 added lines, -16 removed lines

@@ -47,19 +47,23 @@ 
      */
     public function encrypt(Key $key, $message)
     {
-        if(!($key instanceof RSAPublicKey))
-            throw new InvalidKeyTypeAlgorithmException('key is not public');
+        if(!($key instanceof RSAPublicKey)) {
+                    throw new InvalidKeyTypeAlgorithmException('key is not public');
+        }
 
-        if($key->getFormat() !== 'PKCS8')
-            throw new InvalidKeyTypeAlgorithmException('keys is not on PKCS1 format');
+        if($key->getFormat() !== 'PKCS8') {
+                    throw new InvalidKeyTypeAlgorithmException('keys is not on PKCS1 format');
+        }
 
         $res = $this->rsa_impl->loadKey($key->getEncoded());
 
-        if(!$res)
-            throw new InvalidKeyTypeAlgorithmException('could not parse the key');
+        if(!$res) {
+                    throw new InvalidKeyTypeAlgorithmException('could not parse the key');
+        }
 
-        if($this->rsa_impl->getSize() < $this->getMinKeyLen())
-            throw new InvalidKeyTypeAlgorithmException('len is invalid');
+        if($this->rsa_impl->getSize() < $this->getMinKeyLen()) {
+                    throw new InvalidKeyTypeAlgorithmException('len is invalid');
+        }
 
         return $this->rsa_impl->encrypt($message);
     }
@@ -72,20 +76,24 @@ 
      */
     public function decrypt(Key $key, $enc_message){
 
-        if(!($key instanceof RSAPrivateKey))
-            throw new InvalidKeyTypeAlgorithmException('key is not private');
+        if(!($key instanceof RSAPrivateKey)) {
+                    throw new InvalidKeyTypeAlgorithmException('key is not private');
+        }
 
 
-        if($key->getFormat() !== 'PKCS1')
-            throw new InvalidKeyTypeAlgorithmException('keys is not on PKCS1 format');
+        if($key->getFormat() !== 'PKCS1') {
+                    throw new InvalidKeyTypeAlgorithmException('keys is not on PKCS1 format');
+        }
 
         $res = $this->rsa_impl->loadKey($key->getEncoded());
 
-        if(!$res)
-            throw new InvalidKeyTypeAlgorithmException('could not parse the key');
+        if(!$res) {
+                    throw new InvalidKeyTypeAlgorithmException('could not parse the key');
+        }
 
-        if($this->rsa_impl->getSize() < $this->getMinKeyLen())
-            throw new InvalidKeyTypeAlgorithmException('len is invalid');
+        if($this->rsa_impl->getSize() < $this->getMinKeyLen()) {
+                    throw new InvalidKeyTypeAlgorithmException('len is invalid');
+        }
 
         return $this->rsa_impl->decrypt($enc_message);
     }

src/jwa/cryptographic_algorithms/content_encryption/AES_CBC_HS/AES_CBC_HMAC_SHA2_Algorithm.php

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
     {
         $key_len = strlen($key);
 
-        if($this->getMinKeyLen() > ByteUtil::bitLength($key_len))
+        if ($this->getMinKeyLen() > ByteUtil::bitLength($key_len))
             throw new InvalidKeyLengthAlgorithmException;
 
         $enc_key_len = $key_len / 2;
@@ -133,7 +133,7 @@ 
      */
     public function decrypt($cypher_text, $key, $iv, $aad, $tag)
     {
-        if(!$this->checkAuthenticationTag($cypher_text, $key, $iv, $aad, $tag))
+        if (!$this->checkAuthenticationTag($cypher_text, $key, $iv, $aad, $tag))
             throw new InvalidAuthenticationTagException;
 
         $enc_key_len = strlen($key) / 2;

Braces +6 added lines, -4 removed lines

@@ -60,8 +60,9 @@ 
     {
         $key_len = strlen($key);
 
-        if($this->getMinKeyLen() > ByteUtil::bitLength($key_len))
-            throw new InvalidKeyLengthAlgorithmException;
+        if($this->getMinKeyLen() > ByteUtil::bitLength($key_len)) {
+                    throw new InvalidKeyLengthAlgorithmException;
+        }
 
         $enc_key_len = $key_len / 2;
         // ENC_KEY = final ENC_KEY_LEN octets of K
@@ -133,8 +134,9 @@ 
      */
     public function decrypt($cypher_text, $key, $iv, $aad, $tag)
     {
-        if(!$this->checkAuthenticationTag($cypher_text, $key, $iv, $aad, $tag))
-            throw new InvalidAuthenticationTagException;
+        if(!$this->checkAuthenticationTag($cypher_text, $key, $iv, $aad, $tag)) {
+                    throw new InvalidAuthenticationTagException;
+        }
 
         $enc_key_len = strlen($key) / 2;
         // ENC_KEY = final ENC_KEY_LEN octets of K

Indentation +4 added lines, -4 removed lines

@@ -90,10 +90,10 @@
         // MAC_KEY = initial MAC_KEY_LEN octets of K
         $mac_key = substr($key, 0, $mac_key_len);
             /**
-         * The octet string AL is equal to the number of bits in the
-         * Additional Authenticated Data ($aad) expressed as a 64-bit unsigned
-         * big-endian integer
-         */
+             * The octet string AL is equal to the number of bits in the
+             * Additional Authenticated Data ($aad) expressed as a 64-bit unsigned
+             * big-endian integer
+             */
         $al = ByteUtil::convert2UnsignedLongBE(strlen($aad) * 8);
         // M = MAC(MAC_KEY, A || IV || E || AL)
         $secured_input = implode('', array(

src/jwt/JWTClaim.php

Spacing +4 added lines, -4 removed lines

@@ -44,7 +44,7 @@ 
      * @param string $name
      * @param JsonValue $value
      */
-    public function __construct($name , $value){
+    public function __construct($name, $value) {
         $this->name  = $name;
         $this->value = $value;
     }
@@ -53,21 +53,21 @@ 
     /**
      * @return string
      */
-    public function getName(){
+    public function getName() {
         return $this->name;
     }
 
     /**
      * @return JsonValue
      */
-    public function getValue(){
+    public function getValue() {
         return $this->value;
     }
 
     /**
      * @return array|bool|int|string|\utils\json_types\IJsonObject
      */
-    public function getRawValue(){
+    public function getRawValue() {
         return $this->getValue()->getValue();
     }
 

src/jwt/RegisteredJWTClaimNames.php

Spacing +3 added lines, -5 removed lines

@@ -105,9 +105,8 @@ 
      * @var array
      * @see jwt/impl/JWTClaimSet.php constructor
      */
-    public static $registered_claim_set = array
-    (
-        self::Issuer ,
+    public static $registered_claim_set = array(
+        self::Issuer,
         self::Subject,
         self::Audience,
         self::IssuedAt,
@@ -119,8 +118,7 @@ 
     /**
      * @var array
      */
-    public static $registered_claim_set_types = array
-    (
+    public static $registered_claim_set_types = array(
         self::Issuer         => JsonTypes::StringOrURI,
         self::Audience       => JsonTypes::StringOrURI,
         self::Subject        => JsonTypes::StringOrURI,

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